X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmetadata%2Ftest_ust;h=fc9aea536fbbe28086839f3d355e0730471d688a;hb=8d5a3312b34841f1ecba2605acad3eaca79fd5e4;hp=ba34b7f4c4834c79916551152611cfd9ced969b1;hpb=fc2dd19e2c7dbeaa86654b47c0a2c221b7018ecf;p=lttng-tools.git

diff --git a/tests/regression/tools/metadata/test_ust b/tests/regression/tools/metadata/test_ust
index ba34b7f4c..fc9aea536 100755
--- a/tests/regression/tools/metadata/test_ust
+++ b/tests/regression/tools/metadata/test_ust
@@ -13,7 +13,7 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t tmp.test_metadata_env_ust_trace_path.XXXXXX)
 
 NUM_TESTS=37
 
@@ -31,17 +31,14 @@ fi
 
 function test_per_uid ()
 {
-	local metadata
-	local metadata_env
 	local metadata_path
 	local value
 	local value2
 
 	local expected_path="${TRACE_PATH}/lttng-traces"
 	local session_name="per-uid"
-
-	metadata=$(mktemp)
-	metadata_env=$(mktemp)
+	local metadata=$(mktemp -t tmp.test_${FUNCNAME[0]}_metadata.XXXXXX)
+	local metadata_env=$(mktemp -t tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX)
 
 	diag "Test UST metadata env field in per-uid mode"
 	create_lttng_session_ok "$session_name"
@@ -121,8 +118,6 @@ function test_per_uid ()
 
 function test_per_pid ()
 {
-	local metadata
-	local metadata_env
 	local metadata_path
 	local testapp_pid
 	local value
@@ -130,9 +125,8 @@ function test_per_pid ()
 
 	local expected_path="${TRACE_PATH}/lttng-traces"
 	local session_name="per-pid"
-
-	metadata=$(mktemp)
-	metadata_env=$(mktemp)
+	local metadata=$(mktemp -t tmp.test_${FUNCNAME[0]}_metadata.XXXXXX)
+	local metadata_env=$(mktemp -t tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX)
 
 	diag "Test UST metadata env field in per-pid mode"
 	create_lttng_session_ok "$session_name"
@@ -228,6 +222,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 # Use LTTNG_HOME since we want the complete "default" lttng directory hierarchy
 # with "<session_name>-<datetime>/...".
 LTTNG_HOME="$TRACE_PATH"