X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Fstart-stop%2Ftest_start_stop;h=c3a4e7fbd891be114f9752433ec682a3cf78198e;hb=e971184584781f70bbbfc52bbede8b9abf0436e5;hp=a6fc7bd028e3f3ff2e818d4a1cbb5c816f74413d;hpb=70c766ac8dfa25ccb07dfdf1b1835e9c6a98807b;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 a6fc7bd02..c3a4e7fbd 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 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 --type=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 --type=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