From 4530074001b3058adb86b540df99ad9ceab371eb Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 23 Nov 2021 12:15:42 -0500 Subject: [PATCH] Fix: test: use BABELTRACE_BIN instead of babeltrace MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Observed issue ============== The System tests jobs fails on multi-session test since the move to bt2. Cause ===== The tests uses `babeltrace` instead of `BABELTRACE_BIN`. Solution ======== Use `BABELTRACE_BIN`. Add a babelrace bail out. While there fix easy shellcheck warning. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: I441d736e85c447c5765bffd520ec2f267c86048f --- .../regression/ust/multi-session/test_multi_session | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/regression/ust/multi-session/test_multi_session b/tests/regression/ust/multi-session/test_multi_session index 5a58515d5..91f064dae 100755 --- a/tests/regression/ust/multi-session/test_multi_session +++ b/tests/regression/ust/multi-session/test_multi_session @@ -6,13 +6,14 @@ TEST_DESC="UST tracer - Multi-session" -CURDIR=$(dirname $0)/ +CURDIR=$(dirname "$0")/ TESTDIR=$CURDIR/../../.. NR_ITER=100 SESSION_NAME="multi-session" EVENT_NAME="ust_gen_nevents:tptest" NUM_TESTS=28 +# shellcheck source=../../../utils/utils.sh source $TESTDIR/utils/utils.sh if [ ! -x "$CURDIR/gen-nevents" ]; then @@ -25,23 +26,23 @@ test_multi_session() { local out # BEFORE application is spawned - for i in `seq 0 3`; do + for i in $(seq 0 3); do create_lttng_session_ok "$SESSION_NAME-$i" "$TRACE_PATH/$i" enable_ust_lttng_event_ok "$SESSION_NAME-$i" "$EVENT_NAME$i" start_lttng_tracing_ok "$SESSION_NAME-$i" done - ./$CURDIR/gen-nevents $NR_ITER & + "./$CURDIR/gen-nevents" $NR_ITER & ok $? "Start application to generate $NR_ITER events" wait pass "Wait for events to record" - for i in `seq 0 3`; do + for i in $(seq 0 3); do stop_lttng_tracing_ok "$SESSION_NAME-$i" destroy_lttng_session_ok "$SESSION_NAME-$i" - out=$(babeltrace "$TRACE_PATH/$i" | grep "$EVENT_NAMEi$i" | wc -l) - if [ $out -ne $NR_ITER ]; then + out=$($BABELTRACE_BIN "$TRACE_PATH/$i" | grep -c "$EVENT_NAME$i") + if [ "$out" -ne $NR_ITER ]; then fail "Trace validation of $SESSION_NAME-$i" diag "No events found." out=1 -- 2.34.1