From 2b98bf4b5e58eea9d46472512224d55fdb017597 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 1 Oct 2024 14:55:53 -0400 Subject: [PATCH] tests: use bt_cli in cli/test-packet-seq-num.sh Modify this test to use `bt_cli`, in order to get the `Running ...` printout. Use `isnt` to simplify one test while at it. Change-Id: I1fe125b8cadfb8cffaf1b3502d5b730af26212ac Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/13308 Tested-by: jenkins Reviewed-by: Philippe Proulx --- tests/cli/test-packet-seq-num.sh | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/cli/test-packet-seq-num.sh b/tests/cli/test-packet-seq-num.sh index 253694c4..47d0c3d7 100755 --- a/tests/cli/test-packet-seq-num.sh +++ b/tests/cli/test-packet-seq-num.sh @@ -23,28 +23,25 @@ plan_tests $NUM_TESTS test_no_lost() { local trace=$1 - "${BT_TESTS_BT2_BIN}" "$trace" >/dev/null 2>&1 + bt_cli "/dev/null" "/dev/null" "$trace" ok $? "Trace parses" - "${BT_TESTS_BT2_BIN}" "$trace" 2>&1 >/dev/null | bt_grep "\[warning\] Tracer lost" - if test $? = 0; then - fail 1 "Should not find any lost events" - else - ok 0 "No events lost" - fi + + bt_cli /dev/null /dev/fd/3 "$trace" 3>&1 | bt_grep "\[warning\] Tracer lost" + isnt $? 0 "No events lost" } test_lost() { local trace=$1 local expectedcountstr=$2 - "${BT_TESTS_BT2_BIN}" "$trace" >/dev/null 2>&1 + bt_cli "/dev/null" "/dev/null" "$trace" ok $? "Trace parses" # Convert warnings like: # WARNING: Tracer discarded 2 trace packets between .... # WARNING: Tracer discarded 3 trace packets between .... # into "2,3" and make sure it matches the expected result - "${BT_TESTS_BT2_BIN}" "$trace" 2>&1 >/dev/null | bt_grep "WARNING: Tracer discarded" \ + bt_cli /dev/null /dev/fd/3 "$trace" 3>&1 | bt_grep "WARNING: Tracer discarded" \ | cut -d" " -f4 | tr "\n" "," | "${BT_TESTS_SED_BIN}" "s/.$//" | \ bt_grep "$expectedcountstr" >/dev/null ok $? "Lost events string matches $expectedcountstr" -- 2.34.1