X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fust%2Ftest_event_tracef;h=9347fb623d2f085344cf403d22a1f3e10270e950;hp=66528d154cb06086aaddc546a2c0a457cdab4dfd;hb=d37ac3cdc4fe21f117edfb829db4d0eb7cf914a1;hpb=381509704d8b0440b9a99d21606e51f154c81da1

diff --git a/tests/regression/ust/test_event_tracef b/tests/regression/ust/test_event_tracef
index 66528d154..9347fb623 100755
--- a/tests/regression/ust/test_event_tracef
+++ b/tests/regression/ust/test_event_tracef
@@ -1,26 +1,14 @@
 #!/bin/bash
 #
-# Copyright (C) - 2013 Christian Babeux <christian.babeux@efficios.com>
-# Copyright (C) - 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2013 Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
-#
-# This program 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 General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# SPDX-License-Identifier: GPL-2.0-only
 
 TEST_DESC="UST tracer - tracef events"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../..
-LTTNG_BIN="lttng"
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-tracef"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
@@ -37,17 +25,17 @@ fi
 
 function test_event_tracef()
 {
-	create_lttng_session $SESSION_NAME $TRACE_PATH
-	enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
-	start_lttng_tracing $SESSION_NAME
+	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
+	start_lttng_tracing_ok $SESSION_NAME
 
 	$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
 	ok $? "Traced application stopped."
 
-	stop_lttng_tracing $SESSION_NAME
-	destroy_lttng_session $SESSION_NAME
+	stop_lttng_tracing_ok $SESSION_NAME
+	destroy_lttng_session_ok $SESSION_NAME
 
-	trace_matches $EVENT_NAME $NR_ITER $TRACE_PATH
+	trace_match_only $EVENT_NAME $NR_ITER $TRACE_PATH
 
 	return $?
 }