X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_ust;h=bda8ffafb57772686e5fa7281c4008485a7a6f2c;hb=e8526e3f78384fdb3b72860dc4a8f180100e0c85;hp=e6a0bb846569117ee4add0fb11215cd022120653;hpb=5fcaccbce7683a6af772d6f37d03fb01cf248a84;p=lttng-tools.git

diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
index e6a0bb846..bda8ffafb 100755
--- a/tests/regression/tools/streaming/test_ust
+++ b/tests/regression/tools/streaming/test_ust
@@ -49,26 +49,24 @@ function lttng_create_session_uri
 
 function test_ust_before_start ()
 {
-	local file_sync_after_first=$(mktemp -u)
 	local file_sync_before_last=$(mktemp -u)
 
 	diag "Test UST streaming BEFORE tracing starts"
 	lttng_create_session_uri
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
 	# Run 5 times with a 1 second delay
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-before-last-event ${file_sync_before_last} > /dev/null 2>&1 &
 
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	touch ${file_sync_before_last}
 
 	# Wait for the applications started in background
 	wait
 
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
-	rm -f ${file_sync_after_first}
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 	rm -f ${file_sync_before_last}
 }
 
@@ -78,18 +76,19 @@ function test_ust_after_start ()
 
 	diag "Test UST streaming AFTER tracing starts"
 	lttng_create_session_uri
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Run 5 times with a 1 second delay
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} >/dev/null 2>&1
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+		--sync-after-first-event ${file_sync_after_first} >/dev/null 2>&1
 
 	while [ ! -f "${file_sync_after_first}" ]; do
 		sleep 0.5
 	done
 
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	# Wait for the applications started in background
 	wait