X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Ftest_ust;h=45761c5c90cabcff7fba7a64a9bd0a7f428207b0;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=0b96858aabac032960f4bebc1ea80b11cf9d1038;hpb=05aa48da927bdd0ae848f2c704c0a3389480d982;p=lttng-tools.git

diff --git a/tests/regression/tools/live/test_ust b/tests/regression/tools/live/test_ust
index 0b96858aa..45761c5c9 100755
--- a/tests/regression/tools/live/test_ust
+++ b/tests/regression/tools/live/test_ust
@@ -1,29 +1,14 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 Julien Desfossez <julien.desfossez@efficios.com>
-#                      David Goulet <dgoulet@efficios.com>
+# Copyright (C) 2013 Julien Desfossez <julien.desfossez@efficios.com>
+# Copyright (C) 2013 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="Live - User space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
-BABELTRACE_BIN="babeltrace"
 NR_ITER=1
 NR_USEC_WAIT=1
 DELAY_USEC=2000000
@@ -34,7 +19,7 @@ TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="live"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_live_ust_trace_path.XXXXXX)
 
 DIR=$(readlink -f $TESTDIR)
 
@@ -59,15 +44,14 @@ function clean_live_tracing()
 	rm -rf $TRACE_PATH
 }
 
-file_sync_after_first=$(mktemp -u)
+file_sync_after_first=$(mktemp --tmpdir -u tmp.test_live_ust_sync_after_first.XXXXXX)
 
 start_lttng_sessiond_notap
 start_lttng_relayd_notap "-o $TRACE_PATH"
 
 setup_live_tracing
 
-# Run app in background
-$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
@@ -76,12 +60,9 @@ done
 # Start the live test
 $TESTDIR/regression/tools/live/live_test
 
-# Wait for the applications started in background
-wait
-
 clean_live_tracing
 
 rm -f ${file_sync_after_first}
 
-stop_lttng_relayd_notap
 stop_lttng_sessiond_notap
+stop_lttng_relayd_notap