X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftracefile-limits%2Ftest_tracefile_count;h=8e2747afabe57baf1f467173427251cae0e8c7ae;hb=96340a015194538227efcbc654ec02c2ed9961ce;hp=0c23d843b049e9a4e97fc0480cff0ecab15e8505;hpb=d40d4ff64352b007a89343d69f8a2e27cbf9fade;p=lttng-tools.git

diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_count b/tests/regression/tools/tracefile-limits/test_tracefile_count
index 0c23d843b..8e2747afa 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"
@@ -94,7 +86,7 @@ function validate_file_count
 	file_pattern="$2"
 	expected_max_count="$3"
 
-	count=`find $path -name "$file_pattern" -type f | wc -l`
+	count=`find $path -name "$file_pattern" -type f \( ! -iname "*.idx" \) | wc -l`
 
 	if [ "$count" -gt "$expected_max_count" ]; then
 	    fail "Validate file count: $file_pattern"
@@ -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
@@ -124,13 +116,11 @@ function test_tracefile_count_limit ()
 	enable_ust_lttng_event_per_channel \
 	    $session_name $event_name $channel_name
 
-	start_lttng_tracing $session_name
-
-	$TESTAPP_BIN $num_iter >/dev/null 2>&1 &
+	start_lttng_tracing_ok $session_name
 
-	wait_apps
+	$TESTAPP_BIN $num_iter >/dev/null 2>&1
 
-	stop_lttng_tracing $session_name
+	stop_lttng_tracing_ok $session_name
 
 	destroy_lttng_session $session_name