X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Fust_test;h=f65906f11fe5d8aa3e7ddbaba77de86c9e285bf5;hb=086e6add1bf22aa48ef5a3c3e800eea7020a1fed;hp=f05846f3e34bf0840b9c840aa821d97847db96f8;hpb=b5633831f5bfbd7fa83ade17400d3965825eb65f;p=lttng-tools.git

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index f05846f3e..f65906f11 100755
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -181,8 +181,11 @@ function test_ust_local_snapshot ()
 
 function test_ust_local_snapshot_max_size ()
 {
-	subbuf_size=8192
-	num_cpus=`nproc`
+	page_size=`getconf PAGE_SIZE`
+	num_cpus=$(conf_proc_count)
+
+	# The minimum subbuf size is the platform PAGE_SIZE
+	subbuf_size=$(($page_size*2))
 
 	# The minimum size limit is min(subbuf_size) * nb_streams
 	max_size=$(($subbuf_size*$num_cpus))
@@ -265,7 +268,7 @@ function enable_channel_per_uid_mmap_overwrite()
 
 function test_ust_per_uid_local_snapshot ()
 {
-	diag "Test local UST snapshots"
+	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