X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Flive%2Ftest_lttng_ust;h=73164551e40a77cfc89846012733ef95d1ca1266;hp=da9bf9e6649043765008dc9a5bbe197373e02a65;hb=ec0c0977df0e23ef10d673c7ed79c8544e9187b8;hpb=d53addeb964039ae2f544de1d7d452fb5ad6da69

diff --git a/tests/regression/tools/live/test_lttng_ust b/tests/regression/tools/live/test_lttng_ust
index da9bf9e66..73164551e 100755
--- a/tests/regression/tools/live/test_lttng_ust
+++ b/tests/regression/tools/live/test_lttng_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
@@ -62,14 +47,14 @@ function setup_live_tracing()
 		-U net://localhost >/dev/null 2>&1
 	ok $? "Create session in live mode with delay $DELAY_USEC"
 
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 }
 
 function clean_live_tracing()
 {
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 }
 
 start_lttng_sessiond
@@ -77,8 +62,7 @@ start_lttng_relayd "-o $TRACE_PATH"
 
 setup_live_tracing
 
-# Run app in background
-$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
+$TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT >/dev/null 2>&1
 
 clean_live_tracing
 
@@ -87,6 +71,5 @@ rm -rf $TRACE_PATH
 stop_lttng_relayd
 
 test_custom_url
-pkill $RELAYD_BIN
 
 stop_lttng_sessiond