X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_ust;h=cbeb47d8a4d8326c143ba89a195cd7ad8f3454a2;hb=51a7b11ec8712e8888af09cc3d3df3bb848f70e9;hp=7c52f34bced2ac016ba31a43b3213299b5d5ffab;hpb=bf1e8411c30b21bc8dd6184c9890e9885bb7d503;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index 7c52f34bc..cbeb47d8a 100755
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -15,7 +15,7 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp --tmpdir -d -t tmp.test_ust_rotation_trace_path.XXXXXX)
+TRACE_PATH=$(mktemp -d -t tmp.test_ust_rotation_trace_path.XXXXXX)
 
 NUM_TESTS=152
 
@@ -255,6 +255,13 @@ function test_incompatible_sessions ()
 	destroy_lttng_session_ok $SESSION_NAME
 }
 
+function produce_n_events ()
+{
+	local event_count=$1
+
+	$TESTAPP_BIN -i "$event_count" -w 0 > /dev/null 2>&1
+}
+
 function test_ust_local_size_uid ()
 {
 	diag "Rotate uid local session every 2MiB"
@@ -267,7 +274,8 @@ function test_ust_local_size_uid ()
 	lttng_enable_rotation_size_ok $SESSION_NAME $size_threshold
 	start_lttng_tracing_ok $SESSION_NAME
 
-	wait_for_archives "$TRACE_PATH" 5
+	# Cutoff at 100 times the expected size
+	trace_until_n_archives produce_n_events "$TRACE_PATH" 5 $((5 * 100 * size_threshold))
 
 	destroy_lttng_session_ok $SESSION_NAME
 }
@@ -284,7 +292,8 @@ function test_ust_local_size_pid ()
 	lttng_enable_rotation_size_ok $SESSION_NAME $size_threshold
 	start_lttng_tracing_ok $SESSION_NAME
 
-	wait_for_archives "$TRACE_PATH" 3
+	# Cutoff at 100 times the expected size
+	trace_until_n_archives produce_n_events "$TRACE_PATH" 3 $((3 * 100 * size_threshold))
 
 	destroy_lttng_session_ok $SESSION_NAME
 }