X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Fstart-stop%2Ftest_start_stop;h=823fb27a8e8eeb6b83b4bd241fd08b2806f63426;hb=c125de8f5c0dc9ba3ada63e9317e468ffb9e335a;hp=b5937797d0bea1654eaa7587a79917f06d6052e9;hpb=50ad08620ff49e3c27e6eb3fea5151e744ae13ec;p=lttng-tools.git

diff --git a/tests/regression/tools/trigger/start-stop/test_start_stop b/tests/regression/tools/trigger/start-stop/test_start_stop
index b5937797d..823fb27a8 100755
--- 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 -d test-start-action-trace.XXXXXX)
-	local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -u 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,7 +57,7 @@ function test_start_session_action()
 	# a `notify` action.
 	lttng_add_trigger_ok \
 		$TRIGGER_NAME \
-		--condition event-rule-matches -u --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 -d test-stop-action-trace.XXXXXX)
-	local SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -u 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,7 +111,7 @@ function test_stop_session_action()
 	# a `notify` action.
 	lttng_add_trigger_ok \
 		$TRIGGER_NAME \
-		--condition event-rule-matches -u --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