port: add support for BSD mktemp

[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 f302d17d6617599c15fe43d0658d116ff37dc8de..9a6d52b35aa77ccbe03fd5b9b16a6bd97056edbd 100755 (executable)
--- a/tests/regression/tools/trigger/start-stop/test_start_stop
+++ b/tests/regression/tools/trigger/start-stop/test_start_stop
@@ -25,7 +25,7 @@ NR_USEC_WAIT=5
 function lttng_session_is_active()
 {
        local SESSION_NAME="$1"
-       "$FULL_LTTNG_BIN" list "$SESSION_NAME" | grep "Tracing session" | grep -q "\[active\]"
+       "$FULL_LTTNG_BIN" list "$SESSION_NAME" | grep "Recording session" | grep -q "\[active\]"
 
        ok $ret "Session \"$SESSION_NAME\" is active"
 }
@@ -33,7 +33,7 @@ function lttng_session_is_active()
 function lttng_session_is_inactive()
 {
        local SESSION_NAME="$1"
-       "$FULL_LTTNG_BIN" list "$SESSION_NAME" | grep "Tracing session" | grep -q "\[inactive\]"
+       "$FULL_LTTNG_BIN" list "$SESSION_NAME" | grep "Recording session" | grep -q "\[inactive\]"
 
        ok $ret "Session \"$SESSION_NAME\" is inactive"
 }
@@ -42,8 +42,8 @@ function test_start_session_action()
 {
        local SESSION_NAME="my_triggered_session"
        local TRIGGER_NAME="trigger1"
-       local TRACE_PATH=$(mktemp --tmpdir -d test-start-action-trace.XXXXXX)
-       local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp --tmpdir -u test-notif-register.XXXXXX)
+       local TRACE_PATH=$(mktemp -d -t test-start-action-trace.XXXXXX)
+       local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -u -t test-notif-register.XXXXXX)
 
        diag "Start session action"
 
@@ -57,7 +57,7 @@ function test_start_session_action()
        # a `notify` action.
        lttng_add_trigger_ok \
                $TRIGGER_NAME \
-               --condition event-rule-matches --domain=user --name=tp:tptest \
+               --condition event-rule-matches --type=user --name=tp:tptest \
                --action start-session $SESSION_NAME \
                --action notify
 
@@ -95,8 +95,8 @@ function test_stop_session_action()
 {
        local SESSION_NAME="my_triggered_session"
        local TRIGGER_NAME="trigger1"
-       local TRACE_PATH=$(mktemp --tmpdir -d test-stop-action-trace.XXXXXX)
-       local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp --tmpdir -u test-notif-register.XXXXXX)
+       local TRACE_PATH=$(mktemp -d -t test-stop-action-trace.XXXXXX)
+       local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -u -t test-notif-register.XXXXXX)
 
        diag "Stop session action"
        create_lttng_session_ok $SESSION_NAME "$TRACE_PATH"
@@ -111,7 +111,7 @@ function test_stop_session_action()
        # a `notify` action.
        lttng_add_trigger_ok \
                $TRIGGER_NAME \
-               --condition event-rule-matches --domain=user --name=tp:tptest \
+               --condition event-rule-matches --type=user --name=tp:tptest \
                --action stop-session $SESSION_NAME \
                --action notify
 
@@ -148,6 +148,7 @@ function test_stop_session_action()
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
+bail_out_if_no_babeltrace
 
 start_lttng_sessiond_notap