Tests: use babeltrace2 for all tests

[lttng-tools.git] / tests / regression / ust / getcpu-override / test_getcpu_override

diff --git a/tests/regression/ust/getcpu-override/test_getcpu_override b/tests/regression/ust/getcpu-override/test_getcpu_override
index 72010581e83aa251451ba4ffeee8db32c11d97f9..124219a36757352c743d563ff5004cc8aef69745 100755 (executable)
--- a/tests/regression/ust/getcpu-override/test_getcpu_override
+++ b/tests/regression/ust/getcpu-override/test_getcpu_override
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2015 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2015 Jonathan Rajotte <jonathan.rajotte-julien@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="UST - Getcpu override plugin"
 
 CURDIR=$(dirname $0)/
@@ -55,14 +45,14 @@ num_cpus=$(conf_proc_count)
 run_app()
 {
        diag "Launching app without getcpu-plugin wrapper"
-       $TESTAPP_BIN $NUM_EVENT $EVENT_WAIT_USEC
+       $TESTAPP_BIN -i $NUM_EVENT -w $EVENT_WAIT_USEC
        ok $? "Application without wrapper done"
 }
 
 run_getcpu_plugin_app()
 {
        diag "Launching app with getcpu-plugin wrapper"
-       $CURDIR/$TESTAPP_WRAPPER $TESTAPP_BIN $NUM_EVENT $EVENT_WAIT_USEC
+       $CURDIR/$TESTAPP_WRAPPER $TESTAPP_BIN -i $NUM_EVENT -w $EVENT_WAIT_USEC
        ok $? "Application with wrapper done"
 }
 
@@ -157,6 +147,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 if [ ! -x "$CURDIR/.libs/lttng-ust-getcpu-override-test.so" ]; then
        skip 0 "No shared object generated. Skipping all tests." $NUM_TESTS && exit 0
 fi
@@ -183,7 +175,7 @@ start_lttng_sessiond
 
 for fct_test in ${TESTS[@]};
 do
-       TRACE_PATH=$(mktemp -d)
+       TRACE_PATH=$(mktemp --tmpdir -d tmp.test_getcpu_override_trace_path.XXXXXX)
 
        ${fct_test}
        if [ $? -ne 0 ]; then