X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Ftest_ust_tracefile_count;h=3ef2ee1e9627c9ccc7188f24aa7b9b2786ed271d;hp=464f4aacb69b60fe1879e88c520863c994d7802d;hb=0fc2834cb1892927708c858baf0147f1cddd1219;hpb=cef0f7d51b8025d3ba04e6496242c1cca1641aa6 diff --git a/tests/regression/tools/live/test_ust_tracefile_count b/tests/regression/tools/live/test_ust_tracefile_count index 464f4aacb..3ef2ee1e9 100755 --- a/tests/regression/tools/live/test_ust_tracefile_count +++ b/tests/regression/tools/live/test_ust_tracefile_count @@ -61,18 +61,16 @@ function clean_live_tracing() } if [ -z $(pidof lt-$SESSIOND_BIN) ]; then - $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" + $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" if [ $? -eq 1 ]; then echo "Fail to start lttng-sessiond" exit 1 fi - # Wait for sessiond to bootstrap - sleep 2 fi -opt="-o $TRACE_PATH" +opt="-o $TRACE_PATH --background" if [ -z $(pidof lt-$RELAYD_BIN) ]; then - $DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1 & + $DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1 if [ $? -eq 1 ]; then echo "Fail to start lttng-relayd (opt: $opt)" return 1 @@ -82,11 +80,7 @@ fi setup_live_tracing # Run app in background -$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 & -# Wait for app to complete -while [ -n "$(pidof $TESTAPP_NAME)" ]; do - sleep 0.5 -done +$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 # Start the live test $TESTDIR/regression/tools/live/live_test