X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ftrigger%2Frate-policy%2Ftest_ust_rate_policy;h=91a571c13226dc59f6346d71eca79007e38df4ce;hp=27d813048769e95c60be6d5f90ac235f7f3d94a1;hb=33e557114a2ba28e26e220a833e8a449c78b8b65;hpb=7f4d5b07cf7be895b38b69073389a4fcc318ec29

diff --git a/tests/regression/tools/trigger/rate-policy/test_ust_rate_policy b/tests/regression/tools/trigger/rate-policy/test_ust_rate_policy
index 27d813048..91a571c13 100755
--- a/tests/regression/tools/trigger/rate-policy/test_ust_rate_policy
+++ b/tests/regression/tools/trigger/rate-policy/test_ust_rate_policy
@@ -28,7 +28,7 @@ function test_rate_policy_every_n()
 	local END_TRIGGER_NAME="end-trigger1"
 	local SYNC_AFTER_NOTIF_REGISTER_PATH
 
-	SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -u test-notif-register.XXXXXX)
+	SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp --tmpdir -u test-notif-register.XXXXXX)
 
 	diag "Every N rate policy"
 
@@ -36,9 +36,9 @@ function test_rate_policy_every_n()
 	# time the condition is met.
 	lttng_add_trigger_ok \
 		$TRIGGER_NAME \
-		--condition on-event -u "tp:tptest" \
+		--condition event-rule-matches --domain=user --name="tp:tptest" \
 		--action notify \
-	        --fire-every 5
+	        --rate-policy=every:5
 
 	# Add a trigger with a notify action for the tp:end event of the test
 	# application. This allow us to "delimit" the reception loop for the
@@ -46,7 +46,7 @@ function test_rate_policy_every_n()
 	# the notification subsystem. 
 	lttng_add_trigger_ok \
 		$END_TRIGGER_NAME \
-		--condition on-event -u "tp:end" \
+		--condition event-rule-matches --domain=user --name="tp:end" \
 		--action notify
 
 	for i in $(seq 1 4); do
@@ -114,7 +114,7 @@ function test_rate_policy_once_after_n()
 	local END_TRIGGER_NAME="end-trigger1"
 	local SYNC_AFTER_NOTIF_REGISTER_PATH
 
-	SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp -u test-notif-register.XXXXXX)
+	SYNC_AFTER_NOTIF_REGISTER_PATH=$(mktemp --tmpdir -u test-notif-register.XXXXXX)
 
 	diag "Once after N rate policy"
 
@@ -122,9 +122,9 @@ function test_rate_policy_once_after_n()
 	# time the condition is met.
 	lttng_add_trigger_ok \
 		$TRIGGER_NAME \
-		--condition on-event -u "tp:tptest" \
+		--condition event-rule-matches --domain=user --name="tp:tptest" \
 		--action notify \
-	        --fire-once-after 5
+	        --rate-policy=once-after:5
 
 	# Add a trigger with a notify action for the tp:end event of the test
 	# application. This allow us to "delimit" the reception loop for the
@@ -132,7 +132,7 @@ function test_rate_policy_once_after_n()
 	# the notification subsystem. 
 	lttng_add_trigger_ok \
 		$END_TRIGGER_NAME \
-		--condition on-event -u "tp:end" \
+		--condition event-rule-matches --domain=user --name="tp:end" \
 		--action notify
 
 	## Phase 1