X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftracefile-limits%2Ftest_tracefile_count;h=8dfcbad739a3b7fe4c33a6f6e38cd868dc4b2c9d;hp=afe5435bd4e491388d7b42a5963b87389814a43a;hb=bf6ae429bc7bf2fefdce61e48806768dab7567d5;hpb=d3e2ba59faddb31870e2ce29b6a881f7ad5ad883 diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_count b/tests/regression/tools/tracefile-limits/test_tracefile_count index afe5435bd..8dfcbad73 100755 --- a/tests/regression/tools/tracefile-limits/test_tracefile_count +++ b/tests/regression/tools/tracefile-limits/test_tracefile_count @@ -25,7 +25,7 @@ TESTAPP_NAME="gen-ust-events" TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME" STATS_BIN="$TESTDIR/utils/babelstats.pl" -NUM_TESTS=82 +NUM_TESTS=74 NUM_CPUS=`nproc` @@ -35,14 +35,6 @@ if [ ! -x "$TESTAPP_BIN" ]; then BAIL_OUT "No UST events binary detected." fi -function wait_apps -{ - while [ -n "$(pidof $TESTAPP_NAME)" ]; do - sleep 0.5 - done - pass "Wait for applications to end" -} - function enable_lttng_channel_count_limit () { sess_name="$1" @@ -116,7 +108,7 @@ function test_tracefile_count_limit () diag "Test tracefile count limit : $count_limit tracefiles" - create_lttng_session $session_name $trace_path + create_lttng_session_ok $session_name $trace_path enable_lttng_channel_count_limit \ $session_name $channel_name $count_limit @@ -126,9 +118,7 @@ function test_tracefile_count_limit () start_lttng_tracing $session_name - $TESTAPP_BIN $num_iter >/dev/null 2>&1 & - - wait_apps + $TESTAPP_BIN $num_iter >/dev/null 2>&1 stop_lttng_tracing $session_name