X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fsnapshots%2Fust_test;h=3f7ee2555d87a4ceb2640f7bc2ac5bab51a4bd45;hp=7540be2d490f1074ff4a74204295e7004560c04d;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hpb=b67cdb8c808af540b7c0062e756170238057c6f3

diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 7540be2d4..3f7ee2555 100755
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 Julien Desfossez <jdesfossez@efficios.com>
+# Copyright (C) 2013 Julien Desfossez <jdesfossez@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="Snapshots - UST tracing"
 
 CURDIR=$(dirname $0)/
@@ -49,7 +39,7 @@ function start_test_app()
 	local tmp_file=$(mktemp -u)
 
 	# Start application with a temporary file.
-	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
+	$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT --sync-after-first-event $tmp_file &
 	ret=$?
 	APPS_PID="${APPS_PID} ${!}"
 	ok $ret "Start application to trace"
@@ -193,7 +183,7 @@ function test_ust_local_snapshot ()
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -224,7 +214,7 @@ function test_ust_local_snapshot_small_discard_buffers ()
 	enable_mmap_small_discard_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Run test apps, wait for them to complete.
 	start_test_app
@@ -269,7 +259,7 @@ function test_ust_local_snapshot_small_overwrite_buffers ()
 	enable_mmap_small_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Run test apps, wait for them to complete.
 	start_test_app
@@ -367,7 +357,7 @@ function test_ust_local_snapshot_large_metadata ()
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $LM_EVENT $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 	$LM_BIN 1 1
 	ok $? "Start application to trace"
 	lttng_snapshot_record $SESSION_NAME
@@ -400,7 +390,7 @@ function test_ust_per_uid_local_snapshot ()
 	enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -429,7 +419,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 	enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app
@@ -457,7 +447,7 @@ function test_ust_local_snapshots ()
 	enable_lttng_mmap_overwrite_ust_channel $SESSION_NAME $CHANNEL_NAME
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
 	start_lttng_tracing_ok $SESSION_NAME
-	lttng_snapshot_add_output_ok $SESSION_NAME $TRACE_PATH
+	lttng_snapshot_add_output_ok $SESSION_NAME file://$TRACE_PATH
 
 	# Returns once the application has at least fired ONE tracepoint.
 	start_test_app