X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_ust;h=e3fd9af42d1e5af8c27b9cfd7d402e5f2ff305a1;hp=3d43ee1b4567a477ebefd2c8a044faebf863930b;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hpb=f0d43d3d8e0c7fcb01ba1550466517d047fd6e76

diff --git a/tests/regression/tools/streaming/test_ust b/tests/regression/tools/streaming/test_ust
index 3d43ee1b4..e3fd9af42 100755
--- a/tests/regression/tools/streaming/test_ust
+++ b/tests/regression/tools/streaming/test_ust
@@ -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="Streaming - User space tracing"
 
 CURDIR=$(dirname $0)/
@@ -25,7 +15,6 @@ TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
-PID_RELAYD=0
 
 TRACE_PATH=$(mktemp -d)
 
@@ -41,7 +30,6 @@ fi
 
 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"
@@ -49,7 +37,7 @@ function test_ust_before_start ()
 	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_ok $SESSION_NAME
 
@@ -60,7 +48,6 @@ function test_ust_before_start ()
 
 	stop_lttng_tracing_ok $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
-	rm -f ${file_sync_after_first}
 	rm -f ${file_sync_before_last}
 }
 
@@ -74,7 +61,8 @@ function test_ust_after_start ()
 	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