X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fregen-metadata%2Ftest_ust;h=60735c3649c1e73a89ad0b1a6c31a95de61dff39;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hp=2a761307409f1ed594e4f0f71d75b6bf0e24f4e0;hpb=dbbc5b0a971a544a1b79dcf9d172259140dd7ac5;p=lttng-tools.git

diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust
index 2a7613074..60735c364 100755
--- a/tests/regression/tools/regen-metadata/test_ust
+++ b/tests/regression/tools/regen-metadata/test_ust
@@ -16,7 +16,7 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_regen_metadata_ust_trace_path.XXXXXX)
 
 NUM_TESTS=39
 
@@ -39,8 +39,8 @@ function enable_channel_per_pid()
 
 function test_ust_streaming ()
 {
-	local file_sync_after_first=$(mktemp -u)
-	local file_sync_before_last=$(mktemp -u)
+	local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 	local metadata_path
 
 	diag "Test UST streaming with metadata regeneration"
@@ -63,7 +63,7 @@ function test_ust_streaming ()
 	validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"*
 
 	# Find the metadata file
-	metadata_path=$(find "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* | grep metadata)
+	metadata_path=$(find "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* -name "metadata")
 
 	# Empty the metadata file
 	echo -n > "$metadata_path"
@@ -83,8 +83,8 @@ function test_ust_streaming ()
 
 function test_ust_local ()
 {
-	local file_sync_after_first=$(mktemp -u)
-	local file_sync_before_last=$(mktemp -u)
+	local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 	local metadata_path
 
 	diag "Test UST local with metadata regeneration"
@@ -107,7 +107,7 @@ function test_ust_local ()
 	validate_trace $EVENT_NAME "$TRACE_PATH"
 
 	# Find the metadata file
-	metadata_path=$(find "$TRACE_PATH"* | grep metadata)
+	metadata_path=$(find "$TRACE_PATH"* -name "metadata")
 
 	# Empty the metadata file
 	echo -n > "$metadata_path"
@@ -127,8 +127,8 @@ function test_ust_local ()
 
 function test_ust_pid ()
 {
-	local file_sync_after_first=$(mktemp -u)
-	local file_sync_before_last=$(mktemp -u)
+	local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
 	diag "Test UST per-pid with metadata regeneration (expect failure)"
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -161,8 +161,8 @@ function test_ust_pid ()
 
 function test_ust_live ()
 {
-	local file_sync_after_first=$(mktemp -u)
-	local file_sync_before_last=$(mktemp -u)
+	local file_sync_after_first=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+	local file_sync_before_last=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
 	diag "Test UST live with metadata regeneration (expect failure)"
 	create_lttng_session_uri $SESSION_NAME net://localhost --live
@@ -195,6 +195,7 @@ function test_ust_live ()
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
+bail_out_if_no_babeltrace
 
 start_lttng_relayd "-o $TRACE_PATH"
 start_lttng_sessiond