Fix: test: start-stop trigger: test execution is invalid

[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 cecea3b19e07f193120c4b59e96b6da8fd7adf67..a09279eeed51a8986a630242ebff4bb42fb8b050 100755 (executable)
--- a/tests/regression/tools/trigger/start-stop/test_start_stop
+++ b/tests/regression/tools/trigger/start-stop/test_start_stop
@@ -22,47 +22,6 @@ NUM_TESTS=18
 NR_ITER=5
 NR_USEC_WAIT=5
 
-function lttng_add_trigger_ust()
-{
-       local expected_to_fail="$1"
-       local trigger_name="$2"
-       shift 2
-
-       "$FULL_LTTNG_BIN" add-trigger --id "$trigger_name" "$@" 1> /dev/null 2> /dev/null
-       ret=$?
-       if [[ $expected_to_fail -eq "1" ]]; then
-               test "$ret" -ne "0"
-               ok $? "Add trigger $trigger_name failed as expected"
-       else
-               ok $ret "Add trigger $trigger_name"
-       fi
-}
-
-function lttng_remove_trigger_ust()
-{
-       local expected_to_fail="$1"
-       local trigger_name="$2"
-
-       "$FULL_LTTNG_BIN" remove-trigger "$trigger_name" 1> /dev/null 2> /dev/null
-       ret=$?
-       if [[ $expected_to_fail -eq "1" ]]; then
-               test "$ret" -ne "0"
-               ok $? "Remove trigger $trigger_name failed as expected"
-       else
-               ok $ret "Remove trigger $trigger_name"
-       fi
-}
-
-function lttng_add_trigger_ust_ok()
-{
-       lttng_add_trigger_ust 0 "$@"
-}
-
-function lttng_remove_trigger_ust_ok()
-{
-       lttng_remove_trigger_ust 0 "$@"
-}
-
 function lttng_session_is_active()
 {
        local SESSION_NAME="$1"
@@ -84,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"
 
@@ -96,7 +55,7 @@ function test_start_session_action()
 
        # Add `start-session` action to an event-rule condition _followed_ by
        # a `notify` action.
-       lttng_add_trigger_ust_ok \
+       lttng_add_trigger_ok \
                $TRIGGER_NAME \
                --condition on-event -u "tp:tptest" \
                --action start-session $SESSION_NAME \
@@ -105,7 +64,7 @@ function test_start_session_action()
        # 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
@@ -124,7 +83,7 @@ function test_start_session_action()
        lttng_session_is_active $SESSION_NAME
 
        # Tearing down.
-       lttng_remove_trigger_ust_ok $TRIGGER_NAME
+       lttng_remove_trigger_ok $TRIGGER_NAME
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
 
@@ -137,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"
@@ -150,7 +109,7 @@ function test_stop_session_action()
 
        # Add `stop-session` action to an event-rule condition _followed_ by
        # a `notify` action.
-       lttng_add_trigger_ust_ok \
+       lttng_add_trigger_ok \
                $TRIGGER_NAME \
                --condition on-event -u "tp:tptest" \
                --action stop-session $SESSION_NAME \
@@ -159,7 +118,7 @@ function test_stop_session_action()
        # 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
@@ -178,7 +137,7 @@ function test_stop_session_action()
        lttng_session_is_inactive $SESSION_NAME
 
        # Tearing down.
-       lttng_remove_trigger_ust_ok $TRIGGER_NAME
+       lttng_remove_trigger_ok $TRIGGER_NAME
        destroy_lttng_session_ok $SESSION_NAME
 
        rm -f "$SYNC_AFTER_NOTIF_REGISTER_PATH"