X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Fust_test;h=aa9d4763e6c762419cf678f77e5c7db68eba4cf1;hb=9f0e230a68c5715f28372aa3df9ad1cb13cf6b43;hp=54321817dc28fe575b5d62dedbb6278c52dd6f72;hpb=03f66fb8271904c7bca9d3cfd5b3cf1d9c4e5221;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 54321817d..aa9d4763e 100755
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -156,8 +156,6 @@ function enable_mmap_small_overwrite_ust_channel ()
 function test_ust_list_output ()
 {
 	output_names=("randomname" "somesnapshot")
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
 
 	diag "Test UST snapshot output listing"
 	create_lttng_session_no_output $SESSION_NAME
@@ -187,7 +185,7 @@ function test_ust_list_output ()
 
 function test_ust_local_snapshot ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 
 	diag "Test local UST snapshots"
@@ -195,7 +193,7 @@ function test_ust_local_snapshot ()
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -226,7 +224,7 @@ function test_ust_local_snapshot_small_discard_buffers ()
 	enable_mmap_small_discard_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Run test apps, wait for them to complete.
 	start_test_app
@@ -271,7 +269,7 @@ function test_ust_local_snapshot_small_overwrite_buffers ()
 	enable_mmap_small_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Run test apps, wait for them to complete.
 	start_test_app
@@ -306,7 +304,7 @@ function test_ust_local_snapshot_small_overwrite_buffers ()
 
 function test_ust_local_snapshot_max_size ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 	page_size=`getconf PAGE_SIZE`
 	num_cpus=$(conf_proc_count)
@@ -339,10 +337,10 @@ function test_ust_local_snapshot_max_size ()
 	if [ "$sum_size_tracefiles" -gt "$max_size" ]; then
 		fail "Tracefiles size sum validation"
 		diag "Tracefiles size sum: $sum_size_tracefiles Expected max: $max_size"
+	else
+		pass "Tracefiles size sum validation"
 	fi
 
-	pass "Tracefiles size sum validation"
-
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -359,8 +357,6 @@ function test_ust_local_snapshot_max_size ()
 
 function test_ust_local_snapshot_large_metadata ()
 {
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
 	LM_EVENT="tp:tptest1,tp:tptest2,tp:tptest3,tp:tptest4,tp:tptest5"
 	LM_PATH="$TESTDIR/utils/testapp"
 	LM_NAME="gen-ust-nevents"
@@ -371,7 +367,7 @@ function test_ust_local_snapshot_large_metadata ()
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $LM_EVENT $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 	$LM_BIN 1 1
 	ok $? "Start application to trace"
 	lttng_snapshot_record $SESSION_NAME
@@ -388,8 +384,6 @@ function test_ust_local_snapshot_large_metadata ()
 
 function enable_channel_per_uid_mmap_overwrite()
 {
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
 	sess_name=$1
 	channel_name=$2
 
@@ -399,12 +393,14 @@ function enable_channel_per_uid_mmap_overwrite()
 
 function test_ust_per_uid_local_snapshot ()
 {
+	NR_ITER=-1
+	NR_USEC_WAIT=100
 	diag "Test per-uid local UST snapshots"
 	create_lttng_session_no_output $SESSION_NAME
 	enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -425,7 +421,7 @@ function test_ust_per_uid_local_snapshot ()
 
 function test_ust_per_uid_local_snapshot_post_mortem ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 
 	diag "Test local UST snapshots post-mortem"
@@ -433,7 +429,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 	enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -453,7 +449,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 
 function test_ust_local_snapshots ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 
 	diag "Test $NR_SNAPSHOT local UST snapshots"
@@ -461,7 +457,7 @@ function test_ust_local_snapshots ()
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app