X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Fstart-stop%2Ftest_start_stop;h=989079c4dc54c334bc42aacc4b1889c16f57e656;hp=a6fc7bd028e3f3ff2e818d4a1cbb5c816f74413d;hb=64c34630769271a77e5eb8254452e466809ce4d9;hpb=70c766ac8dfa25ccb07dfdf1b1835e9c6a98807b diff --git a/tests/regression/tools/trigger/start-stop/test_start_stop b/tests/regression/tools/trigger/start-stop/test_start_stop index a6fc7bd02..989079c4d 100755 --- a/tests/regression/tools/trigger/start-stop/test_start_stop +++ b/tests/regression/tools/trigger/start-stop/test_start_stop @@ -43,7 +43,7 @@ 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 SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -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 @@ -96,7 +96,7 @@ 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 SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -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