Refactor: test: wrapper for create_lttng_session

[lttng-tools.git] / tests / regression / ust / multi-session / test_multi_session

diff --git a/tests/regression/ust/multi-session/test_multi_session b/tests/regression/ust/multi-session/test_multi_session
index 18e220dcf0e602f99e4786e56a00cc178429bebe..63ed54def122c6b701a021f476bd30365bbbebd1 100755 (executable)
--- a/tests/regression/ust/multi-session/test_multi_session
+++ b/tests/regression/ust/multi-session/test_multi_session
@@ -21,14 +21,12 @@ TESTDIR=$CURDIR/../../..
 NR_ITER=100
 SESSION_NAME="multi-session"
 EVENT_NAME="ust_gen_nevents:tptest"
+NUM_TESTS=28
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 if [ ! -x "$CURDIR/gen-nevents" ]; then
-       echo -e "No UST nevents binary detected. Passing."
-       exit 0
+       BAIL_OUT "No UST nevents binary detected."
 fi
 
 # MUST set TESTDIR before calling those functions
@@ -38,34 +36,29 @@ test_multi_session() {
 
        # BEFORE application is spawned
        for i in `seq 0 3`; do
-               create_lttng_session "$SESSION_NAME-$i" "$TRACE_PATH/$i"
+               create_lttng_session_ok "$SESSION_NAME-$i" "$TRACE_PATH/$i"
                enable_ust_lttng_event "$SESSION_NAME-$i" "$EVENT_NAME$i"
                start_lttng_tracing "$SESSION_NAME-$i"
        done
 
-       echo -n "Starting application generating $NR_ITER events... "
        ./$CURDIR/gen-nevents $NR_ITER &
-       print_ok
+       ok $? "Start application to generate $NR_ITER events"
 
-       # At least hit one event
-       echo -n "Waiting for events to record "
-       while [ -n "$(pidof gen-nevents)" ]; do
-               echo -n "."
-               sleep 0.1
-       done
-       print_ok
+       wait
+       pass "Wait for events to record"
 
        for i in `seq 0 3`; do
                stop_lttng_tracing "$SESSION_NAME-$i"
                destroy_lttng_session "$SESSION_NAME-$i"
                out=$(babeltrace "$TRACE_PATH/$i" | grep "$EVENT_NAMEi$i" | wc -l)
                if [ $out -ne $NR_ITER ]; then
-                       echo -n "No event found. Suppose to have at least one... "
-                       print_fail
+                       fail "Trace validation of $SESSION_NAME-$i"
+                       diag "No events found."
                        out=1
+                       break
                else
-                       echo -n "Found $out event(s) for $SESSION_NAME-$i. Coherent... "
-                       print_ok
+                       pass "Trace validation of $SESSION_NAME-$i"
+                       diag "Found $out event(s) for $SESSION_NAME-$i."
                        out=0
                fi
        done
@@ -75,6 +68,10 @@ test_multi_session() {
 
 # MUST set TESTDIR before calling those functions
 
+plan_tests $NUM_TESTS
+
+print_test_banner "$TEST_DESC"
+
 start_lttng_sessiond
 
 TRACE_PATH=$(mktemp -d)