X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fmetadata%2Ftest_ust;h=6b17b02cf6439eed92c09057254a00d01755ae84;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hp=931746bb64dca7d6ad8cf3f42bedc1d02ad28d72;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/metadata/test_ust b/tests/regression/tools/metadata/test_ust
index 931746bb6..6b17b02cf 100755
--- a/tests/regression/tools/metadata/test_ust
+++ b/tests/regression/tools/metadata/test_ust
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2019 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
 #
 # SPDX-License-Identifier: LGPL-2.1-only
 
@@ -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 --tmpdir -d 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 --tmpdir tmp.test_${FUNCNAME[0]}_metadata.XXXXXX)
+	local metadata_env=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX)
 
 	diag "Test UST metadata env field in per-uid mode"
 	create_lttng_session_ok "$session_name"
@@ -56,7 +53,7 @@ function test_per_uid ()
 	# bt1 accepts only a directory while bt2 accepts either the metadata
 	# file directly or a directory with an immediate metadata file.
 	# Settle for the common denominator.
-	metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+	metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
 	metadata_path=$(dirname "$metadata_path")
 
 	$BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" > "$metadata"
@@ -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 --tmpdir tmp.test_${FUNCNAME[0]}_metadata.XXXXXX)
+	local metadata_env=$(mktemp --tmpdir tmp.test_${FUNCNAME[0]}_metadata_env.XXXXXX)
 
 	diag "Test UST metadata env field in per-pid mode"
 	create_lttng_session_ok "$session_name"
@@ -150,7 +144,7 @@ function test_per_pid ()
 	# bt1 accepts only a directory while bt2 accepts either the metadata
 	# file directly or a directory with an immediate metadata file.
 	# Settle for the common denominator.
-	metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+	metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
 	metadata_path=$(dirname "$metadata_path")
 
 	$BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" 1> "$metadata"
@@ -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"