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

[lttng-tools.git] / tests / regression / tools / trigger / start-stop / test_start_stop

diff --git a/tests/regression/tools/trigger/start-stop/test_start_stop b/tests/regression/tools/trigger/start-stop/test_start_stop
index a6fc7bd028e3f3ff2e818d4a1cbb5c816f74413d..f302d17d6617599c15fe43d0658d116ff37dc8de 100755 (executable)
--- a/tests/regression/tools/trigger/start-stop/test_start_stop
+++ b/tests/regression/tools/trigger/start-stop/test_start_stop
@@ -42,8 +42,8 @@ function test_start_session_action()
 {
        local SESSION_NAME="my_triggered_session"
        local TRIGGER_NAME="trigger1"
-       local TRACE_PATH=$(mktemp -d test-start-action-trace.XXXXXX)
-       local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp test-notif-register.XXXXXX)
+       local TRACE_PATH=$(mktemp --tmpdir -d test-start-action-trace.XXXXXX)
+       local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp --tmpdir -u test-notif-register.XXXXXX)
 
        diag "Start session action"
 
@@ -57,14 +57,14 @@ function test_start_session_action()
        # a `notify` action.
        lttng_add_trigger_ok \
                $TRIGGER_NAME \
-               --condition on-event -u "tp:tptest" \
+               --condition event-rule-matches --domain=user --name=tp:tptest \
                --action start-session $SESSION_NAME \
                --action notify
 
        # Launch notification listener.
        $NOTIFICATION_CLIENT_BIN \
                --trigger $TRIGGER_NAME \
-               --sync-after-notif-register "$SYNC_AFTER_NOTIF_REGISTER_PATH"
+               --sync-after-notif-register "$SYNC_AFTER_NOTIF_REGISTER_PATH" &
        notif_client_pid=$!
 
        while [ ! -f "${SYNC_AFTER_NOTIF_REGISTER_PATH}" ]; do
@@ -95,8 +95,8 @@ function test_stop_session_action()
 {
        local SESSION_NAME="my_triggered_session"
        local TRIGGER_NAME="trigger1"
-       local TRACE_PATH=$(mktemp -d test-stop-action-trace.XXXXXX)
-       local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp test-notif-register.XXXXXX)
+       local TRACE_PATH=$(mktemp --tmpdir -d test-stop-action-trace.XXXXXX)
+       local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp --tmpdir -u test-notif-register.XXXXXX)
 
        diag "Stop session action"
        create_lttng_session_ok $SESSION_NAME "$TRACE_PATH"
@@ -111,14 +111,14 @@ function test_stop_session_action()
        # a `notify` action.
        lttng_add_trigger_ok \
                $TRIGGER_NAME \
-               --condition on-event -u "tp:tptest" \
+               --condition event-rule-matches --domain=user --name=tp:tptest \
                --action stop-session $SESSION_NAME \
                --action notify
 
        # Launch notification listener.
        $NOTIFICATION_CLIENT_BIN \
                --trigger $TRIGGER_NAME \
-               --sync-after-notif-register "$SYNC_AFTER_NOTIF_REGISTER_PATH"
+               --sync-after-notif-register "$SYNC_AFTER_NOTIF_REGISTER_PATH" &
        notif_client_pid=$!
 
        while [ ! -f "${SYNC_AFTER_NOTIF_REGISTER_PATH}" ]; do