X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_ust;h=27f6b679bc551abc8fdfa92677bc63b3031e4cd0;hb=HEAD;hp=e3fd9af42d1e5af8c27b9cfd7d402e5f2ff305a1;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
index e3fd9af42..27f6b679b 100755
--- a/tests/regression/tools/streaming/test_ust
+++ b/tests/regression/tools/streaming/test_ust
@@ -16,9 +16,9 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_streaming_ust_trace_path.XXXXXX)
 
-NUM_TESTS=16
+NUM_TESTS=18
 
 source $TESTDIR/utils/utils.sh
 
@@ -30,7 +30,7 @@ fi
 
 function test_ust_before_start ()
 {
-	local file_sync_before_last=$(mktemp -u)
+	local file_sync_before_last=$(mktemp -u -t "tmp.test_${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
 	diag "Test UST streaming BEFORE tracing starts"
 	create_lttng_session_uri $SESSION_NAME net://localhost
@@ -53,7 +53,7 @@ function test_ust_before_start ()
 
 function test_ust_after_start ()
 {
-	local file_sync_after_first=$(mktemp -u)
+	local file_sync_after_first=$(mktemp -u -t "tmp.test_${FUNCNAME[0]}_sync_after_first.XXXXXX")
 
 	diag "Test UST streaming AFTER tracing starts"
 	create_lttng_session_uri $SESSION_NAME net://localhost
@@ -79,6 +79,7 @@ function test_ust_after_start ()
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
+bail_out_if_no_babeltrace
 
 start_lttng_relayd "-o $TRACE_PATH"
 start_lttng_sessiond
@@ -91,6 +92,7 @@ do
 	${fct_test}
 
 	# Validate test
+	validate_trace_path_ust_uid_network "$TRACE_PATH" "$SESSION_NAME"
 	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
 	if [ $? -eq 0 ]; then
 		# Only delete if successful