X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftracefile-limits%2Ftest_tracefile_size;h=481abc92b80db4a361f0bf30ce54b506ea8d5396;hp=c07972b77f2cba31b3e4e2601d92496370adc1f1;hb=HEAD;hpb=a8cf8647df1373385689de55ba67ddea6fc3e5c3

diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size
index c07972b77..489e68510 100755
--- a/tests/regression/tools/tracefile-limits/test_tracefile_size
+++ b/tests/regression/tools/tracefile-limits/test_tracefile_size
@@ -84,11 +84,11 @@ function check_file_size ()
 
 function test_tracefile_size_limit ()
 {
-	size_limit="$1"
-	trace_path=$(mktemp -d)
-	session_name=$(randstring 16 0)
-	channel_name="channel"
-	event_name="tp:tptest"
+	local size_limit="$1"
+	local trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	local session_name=$(randstring 16 0)
+	local channel_name="channel"
+	local event_name="tp:tptest"
 
 	diag "Test tracefile size limit : $size_limit bytes"
 
@@ -115,7 +115,7 @@ function test_tracefile_size_limit ()
 
 	# Validate tracing data, we should at least have some events
 
-	validate_trace_path_ust_pid "$trace_path" "" "gen-ust-eve-ust"
+	validate_trace_path_ust_pid "$trace_path" "" "gen-ust-events"
 	validate_trace $event_name $trace_path
 
 	rm -rf $trace_path
@@ -124,11 +124,11 @@ function test_tracefile_size_limit ()
 function test_tracefile_size_limit_pagesize ()
 {
 	# Set a size limit lower than the page_size
-	size_limit="$(($PAGE_SIZE-2))"
-	trace_path=$(mktemp -d)
-	session_name=$(randstring 16 0)
-	channel_name="channel"
-	event_name="tp:tptest"
+	local size_limit="$(($PAGE_SIZE-2))"
+	local trace_path=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	local session_name=$(randstring 16 0)
+	local channel_name="channel"
+	local event_name="tp:tptest"
 
 	diag "Test tracefile size limit lower than PAGE_SIZE : $size_limit bytes"
 
@@ -154,7 +154,7 @@ function test_tracefile_size_limit_pagesize ()
 
 	# Validate tracing data, we should at least have some events
 
-	validate_trace_path_ust_pid "$trace_path" "" "gen-ust-eve-ust"
+	validate_trace_path_ust_pid "$trace_path" "" "gen-ust-events"
 	validate_trace $event_name $trace_path
 
 	rm -rf $trace_path
@@ -164,6 +164,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 start_lttng_sessiond
 
 # Test with multiples of PAGE_SIZE