X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Fperiodical-metadata-flush%2Ftest_periodical_metadata_flush;h=848fc2f3ee319fa887325ba8181b19969a999733;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hp=e8f695fedf5c1b155ac56ecf38a56652b9e5aeb2;hpb=c4926bb5e18ba7916ff2a5d2c70ed6b099643e73;p=lttng-tools.git

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 e8f695fed..848fc2f3e 100755
--- a/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
+++ b/tests/regression/ust/periodical-metadata-flush/test_periodical_metadata_flush
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
+
 TEST_DESC="UST tracer - Tracing with per UID buffers and periodical flush"
 
 CURDIR=$(dirname $0)/
@@ -106,7 +96,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"
@@ -138,7 +128,7 @@ test_after_app_pid() {
 	enable_metadata_per_pid $SESSION_NAME
 	enable_channel_per_pid $SESSION_NAME "channel0"
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Start application after tracing
 	start_check_trace_app
@@ -161,8 +151,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
 
@@ -184,7 +174,7 @@ test_before_app_pid() {
 	enable_metadata_per_pid $SESSION_NAME
 	enable_channel_per_pid $SESSION_NAME "channel0"
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	check_app_tmp_file
 	# Let the application at least perform a flush!
@@ -208,8 +198,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
 
@@ -227,7 +217,7 @@ test_after_app_uid() {
 	enable_metadata_per_uid $SESSION_NAME
 	enable_channel_per_uid $SESSION_NAME "channel0"
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	# Start application after tracing
 	start_check_trace_app
@@ -251,8 +241,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
 
@@ -273,7 +263,7 @@ test_before_app_uid() {
 	enable_metadata_per_uid $SESSION_NAME
 	enable_channel_per_uid $SESSION_NAME "channel0"
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
-	start_lttng_tracing $SESSION_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	check_app_tmp_file
 	# Let the application at least perform a flush!
@@ -296,8 +286,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