port: add support for BSD mktemp

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

diff --git a/tests/regression/tools/notification/test_notification_ust_buffer_usage b/tests/regression/tools/notification/test_notification_ust_buffer_usage
index d7df67e90317f832c5b9b8afe018f4929369867f..836eceb2e838eba6228ec3a4f48a6373cfb73ed8 100755 (executable)
--- a/tests/regression/tools/notification/test_notification_ust_buffer_usage
+++ b/tests/regression/tools/notification/test_notification_ust_buffer_usage
@@ -7,11 +7,15 @@
 CURDIR=$(dirname "$0")/
 TESTDIR=$CURDIR/../../../
 
-TMPDIR=$(mktemp -d)
+TEST_TMPDIR=$(mktemp -d -t tmp.test_notif_ust_buffer_usage_dir.XXXXXX)
 
+# Set TMPDIR for further call to mktemp
+export TMPDIR="$TEST_TMPDIR"
+
+set -x
 #This is needed since the testpoint create a pipe with the consumerd type suffixed
-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 -t "lttng.t_p_n.XXXXXX")
 TESTPOINT=$(readlink -f "${CURDIR}/.libs/libpause_consumer.so")
 
 TESTAPP_PATH="$TESTDIR/utils/testapp"
@@ -19,13 +23,14 @@ TESTAPP_PATH="$TESTDIR/utils/testapp"
 GEN_UST_EVENTS_TESTAPP_NAME="gen-ust-events"
 GEN_UST_EVENTS_TESTAPP_BIN="$TESTAPP_PATH/$GEN_UST_EVENTS_TESTAPP_NAME/$GEN_UST_EVENTS_TESTAPP_NAME"
 
-TESTAPP_STATE_PATH=$(mktemp -u "$TMPDIR/application_state.XXXXXXXXXX")
+TESTAPP_STATE_PATH=$(mktemp -u -t "application_state.XXXXXXXXXX")
 
 SESSION_NAME="my_session"
 CHANNEL_NAME="my_channel"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp -d -t "trace_path.XXXXXX")
 PAGE_SIZE=$(getconf PAGE_SIZE)
+set +x
 
 # shellcheck source=../../../utils/utils.sh
 source "$TESTDIR/utils/utils.sh"
@@ -50,7 +55,8 @@ function test_buffer_usage_notification
        ust_event_generator "$GEN_UST_EVENTS_TESTAPP_BIN" "$TESTAPP_STATE_PATH" &
        APP_PID=$!
 
-       "$CURDIR/notification" 2 LTTNG_DOMAIN_UST $SESSION_NAME $CHANNEL_NAME $APP_PID "$TESTAPP_STATE_PATH" "${consumerd_pipe[@]}"
+       "$CURDIR/notification" 2 LTTNG_DOMAIN_UST $APP_PID "$TESTAPP_STATE_PATH" \
+               $SESSION_NAME $CHANNEL_NAME "${consumerd_pipe[@]}"
 
        destroy_lttng_session_notap $SESSION_NAME
 
@@ -70,4 +76,4 @@ test_buffer_usage_notification
 
 stop_lttng_sessiond_notap
 
-rm -rf "$TMPDIR"
+rm -rf "$TEST_TMPDIR"