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 ffe8355a8bfb351709713ceccdcac9bfa78e2c99..63ed54def122c6b701a021f476bd30365bbbebd1 100755 (executable)
--- a/tests/regression/ust/multi-session/test_multi_session
+++ b/tests/regression/ust/multi-session/test_multi_session
@@ -25,8 +25,6 @@ NUM_TESTS=28
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 if [ ! -x "$CURDIR/gen-nevents" ]; then
        BAIL_OUT "No UST nevents binary detected."
 fi
@@ -38,7 +36,7 @@ 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
@@ -46,11 +44,7 @@ test_multi_session() {
        ./$CURDIR/gen-nevents $NR_ITER &
        ok $? "Start application to generate $NR_ITER events"
 
-       # At least hit one event
-       while [ -n "$(pidof gen-nevents)" ]; do
-               sleep 0.1
-       done
-
+       wait
        pass "Wait for events to record"
 
        for i in `seq 0 3`; do
@@ -76,6 +70,8 @@ test_multi_session() {
 
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 start_lttng_sessiond
 
 TRACE_PATH=$(mktemp -d)