X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fperiodical-metadata-flush%2Ftest_periodical_metadata_flush;h=bfc3b2091de8bb158914e5a8c596f4753dc7dfe3;hp=53db813e1758e0921b02c7a45a496053be769929;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=c76133340787e9dd20ce56fdb9a5a6f4cbfe0067

diff --git a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
index 53db813e1..bfc3b2091 100755
--- a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
+++ b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
@@ -27,7 +27,7 @@ SESSION_NAME="periodical-flush"
 EVENT_NAME="tp:tptest"
 BIN_NAME="gen-nevents"
 NUM_TESTS=38
-APP_TMP_FILE="/tmp/lttng_test_ust.42.file"
+APP_TMP_FILE=$(mktemp -u)
 APPS_PID=
 
 source $TESTDIR/utils/utils.sh
@@ -106,7 +106,7 @@ function check_app_tmp_file()
 function start_trace_app()
 {
 	# Start application with a temporary file.
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $APP_TMP_FILE &
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event $APP_TMP_FILE &
 	ret=$?
 	APPS_PID="${APPS_PID} ${!}"
 	ok $ret "Start application to trace"
@@ -134,11 +134,11 @@ test_after_app_pid() {
 
 	diag "Start application AFTER tracing is started"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_metadata_per_pid $SESSION_NAME
 	enable_channel_per_pid $SESSION_NAME "channel0"
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Start application after tracing
 	start_check_trace_app
@@ -161,8 +161,8 @@ test_after_app_pid() {
 		kill -s SIGKILL ${p}
 		wait ${p} 2>/dev/null
 	done
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	wait_trace_apps
 
@@ -180,11 +180,11 @@ test_before_app_pid() {
 	start_trace_app
 
 	# Start application before tracing
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_metadata_per_pid $SESSION_NAME
 	enable_channel_per_pid $SESSION_NAME "channel0"
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
+	start_lttng_tracing_ok $SESSION_NAME
 
 	check_app_tmp_file
 	# Let the application at least perform a flush!
@@ -208,8 +208,8 @@ test_before_app_pid() {
 		wait ${p} 2>/dev/null
 	done
 
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	wait_trace_apps
 
@@ -223,11 +223,11 @@ test_after_app_uid() {
 
 	diag "Start application AFTER tracing is started"
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_metadata_per_uid $SESSION_NAME
 	enable_channel_per_uid $SESSION_NAME "channel0"
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Start application after tracing
 	start_check_trace_app
@@ -251,8 +251,8 @@ test_after_app_uid() {
 		kill -s SIGKILL ${p}
 		wait ${p} 2>/dev/null
 	done
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	wait_trace_apps
 
@@ -269,11 +269,11 @@ test_before_app_uid() {
 	# Start application before tracing
 	start_trace_app
 
-	create_lttng_session $SESSION_NAME $TRACE_PATH
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	enable_metadata_per_uid $SESSION_NAME
 	enable_channel_per_uid $SESSION_NAME "channel0"
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME "channel0"
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
+	start_lttng_tracing_ok $SESSION_NAME
 
 	check_app_tmp_file
 	# Let the application at least perform a flush!
@@ -296,8 +296,8 @@ test_before_app_uid() {
 		kill -s SIGKILL ${p}
 		wait ${p} 2>/dev/null
 	done
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
 	wait_trace_apps