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

[lttng-tools.git] / tests / regression / tools / notification / test_notification_notifier_discarded_count

diff --git a/tests/regression/tools/notification/test_notification_notifier_discarded_count b/tests/regression/tools/notification/test_notification_notifier_discarded_count
index 5f2754362b7a7678e6edb964a31c9cda5e482cf0..3e25d169f41515487624ce1a94f459a6ca0cfe73 100755 (executable)
--- a/tests/regression/tools/notification/test_notification_notifier_discarded_count
+++ b/tests/regression/tools/notification/test_notification_notifier_discarded_count
@@ -7,14 +7,14 @@
 CURDIR=$(dirname "$0")/
 TESTDIR=$CURDIR/../../../
 
-TMPDIR=$(mktemp -d)
+TEST_TMPDIR=$(mktemp --tmpdir -d tmp.test_notifier_discarded_count.XXXXXX)
 
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 
-TESTPOINT_BASE_PATH=$(readlink -f "$TMPDIR/lttng.t_p_n")
-TESTPOINT_PIPE_PATH=$(mktemp -u "${TESTPOINT_BASE_PATH}.XXXXXX")
+TESTPOINT_BASE_PATH=$(readlink -f "$TEST_TMPDIR/lttng.t_p_n")
+TESTPOINT_PIPE_PATH=$(mktemp -u --tmpdir="$TEST_TMPDIR" "lttng.t_p_n.XXXXXX")
 TESTPOINT=$(readlink -f "${CURDIR}/.libs/libpause_sessiond.so")
 
 SH_TAP=1
@@ -37,7 +37,7 @@ plan_tests $NUM_TESTS
 function trigger_get_discarded_notif_number()
 {
        local trigger_name="$1"
-       local list_triggers_stdout=$(mktemp -t list_triggers_stdout.XXXXXX)
+       local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
 
        "$FULL_LTTNG_BIN" list-triggers > "$list_triggers_stdout"
 
@@ -60,7 +60,7 @@ function test_kernel_notifier_discarded_count
 {
        local sessiond_pipe=()
        local trigger_name="my_trigger"
-       local list_triggers_stdout=$(mktemp -t list_triggers_stdout.XXXXXX)
+       local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
 
        # Used on sessiond launch.
        LTTNG_SESSIOND_ENV_VARS="LTTNG_TESTPOINT_ENABLE=1 \
@@ -244,7 +244,7 @@ function test_ust_notifier_discarded_count_multi_uid
        local sessiond_pipe=()
        local root_trigger_name="root_trigger"
        local user_trigger_name="user_trigger"
-       local list_triggers_stdout=$(mktemp -t list_triggers_stdout.XXXXXX)
+       local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
        local NR_USEC_WAIT=0
        local PIPE_SIZE
        local NR_ITER
@@ -324,7 +324,7 @@ function test_ust_notifier_discarded_regardless_trigger_owner
        local sessiond_pipe=()
        local root_trigger_name="root_trigger"
        local user_trigger_name="user_trigger"
-       local list_triggers_stdout=$(mktemp -t list_triggers_stdout.XXXXXX)
+       local list_triggers_stdout=$(mktemp --tmpdir="$TEST_TMPDIR" "list_triggers_stdout.XXXXXX")
        local NR_USEC_WAIT=0
        local PIPE_SIZE
        local NR_ITER
@@ -418,4 +418,4 @@ else
        skip 0 "Root access is needed. Skipping all kernel notification tests." $KERNEL_NUM_TESTS
 fi
 
-rm -rf "$TMPDIR"
+rm -f "$TEST_TMPDIR"