X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftracefile-limits%2Ftest_tracefile_size;h=489e68510f299a7cbe34e91a78ea7461da8b874e;hb=d0eca33e3e66b6d76fa4b64cfe49295bdb5b9c17;hp=5d4b035504512662eafbce0891f132462f7ff4c3;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_size b/tests/regression/tools/tracefile-limits/test_tracefile_size
index 5d4b03550..489e68510 100755
--- a/tests/regression/tools/tracefile-limits/test_tracefile_size
+++ b/tests/regression/tools/tracefile-limits/test_tracefile_size
@@ -17,7 +17,7 @@ TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 
-NUM_TESTS=66
+NUM_TESTS=74
 
 source $TESTDIR/utils/utils.sh
 
@@ -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,6 +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-events"
 	validate_trace $event_name $trace_path
 
 	rm -rf $trace_path
@@ -123,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"
 
@@ -153,6 +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-events"
 	validate_trace $event_name $trace_path
 
 	rm -rf $trace_path
@@ -162,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