Cleanup: tests: name all temporary files to better identify leakage

[lttng-tools.git] / tests / regression / tools / metadata / test_ust

diff --git a/tests/regression/tools/metadata/test_ust b/tests/regression/tools/metadata/test_ust
index cea0d5ced76149d13a4c5860d9937e0dd85a72c4..810a226cf9fd7e3ec26d9eecc508202d3fd5d428 100755 (executable)
--- 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 --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"