Fix: Tests that assume CPU 0 is present

[lttng-tools.git] / tests / regression / ust / blocking / test_blocking

diff --git a/tests/regression/ust/blocking/test_blocking b/tests/regression/ust/blocking/test_blocking
index c5c95903b0190f06efe639691129fc8d1d923496..751b3453b50d7e264e6dd411b96407389931bf1c 100755 (executable)
--- a/tests/regression/ust/blocking/test_blocking
+++ b/tests/regression/ust/blocking/test_blocking
@@ -1,20 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) - 2015 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
-# Copyright (C) - 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2015 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@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 - Blocking mode"
 
 CURDIR=$(dirname $0)/
@@ -29,13 +19,14 @@ EVENT_NAME="tp:tptest"
 
 NUM_TESTS=49
 
-source $TESTDIR/utils/utils.sh
+# shellcheck source=../utils/utils.sh
+source "$TESTDIR/utils/utils.sh"
 
 # MUST set TESTDIR before calling those functions
-# Run app on CPU 0 to ensure we only write in a single ring buffer.
+# Run app on a single CPU to ensure we only write in a single ring buffer.
 function run_app()
 {
-       taskset 0x00000001 $TESTAPP_BIN $NUM_EVENT
+       taskset --cpu-list "$(get_any_available_cpu)" $TESTAPP_BIN -i $NUM_EVENT
        ok $? "Application done"
 }
 
@@ -60,12 +51,12 @@ function test_ust_implicit_no_blocking()
 function test_ust_implicit_no_blocking_with_channel_blocking()
 {
        NUM_EVENT=5000000
-       diag "UST implicit non-blocking mode (default) with blocking-timeout=-1 channel: will hang if fails"
+       diag "UST implicit non-blocking mode (default) with blocking-timeout=inf channel: will hang if fails"
 
        start_lttng_sessiond
        # session in no-output mode
        create_lttng_session_no_output $SESSION_NAME
-       enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME "--blocking-timeout=-1"
+       enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME "--blocking-timeout=inf"
        enable_ust_lttng_event_ok $SESSION_NAME "$EVENT_NAME" $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
        run_app
@@ -125,7 +116,7 @@ function test_ust_blocking_no_discard()
        start_lttng_sessiond
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        # infinite blocking timeout
-       enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME "--blocking-timeout=-1"
+       enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME "--blocking-timeout=inf"
        enable_ust_lttng_event_ok $SESSION_NAME "$EVENT_NAME" $CHANNEL_NAME
        start_lttng_tracing_ok $SESSION_NAME
        LTTNG_UST_ALLOW_BLOCKING=1 run_app
@@ -133,7 +124,7 @@ function test_ust_blocking_no_discard()
        destroy_lttng_session_ok $SESSION_NAME
        stop_lttng_sessiond
 
-       nr_events=$(babeltrace $TRACE_PATH 2>/dev/null | wc -l)
+       nr_events=$("$BABELTRACE_BIN" $TRACE_PATH 2>/dev/null | wc -l)
 
        test $nr_events -eq $NUM_EVENT
        ok $? "No event lost with UST blocking mode: found $nr_events expect $NUM_EVENT"
@@ -143,6 +134,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 TESTS=(
        "test_ust_implicit_no_blocking"
        "test_ust_implicit_no_blocking_with_channel_blocking"
@@ -156,7 +149,7 @@ i=0
 
 while [ "$i" -lt "$TEST_COUNT" ]; do
 
-       TRACE_PATH=$(mktemp -d)
+       TRACE_PATH=$(mktemp -d -t tmp.test_blocking_ust_trace_path.XXXXXX)
 
        # Execute test
        ${TESTS[$i]}