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 <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/13308
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>

diff --git a/tests/cli/test-packet-seq-num.sh b/tests/cli/test-packet-seq-num.sh
index 253694c49b2539ba4472bf5654067a14d44428f8..47d0c3d7b8b2bd6603266a051f6c19a53aa5712e 100755 (executable)
--- 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"