Tests: use babeltrace2 for all tests

[lttng-tools.git] / tests / regression / tools / base-path / test_ust

diff --git a/tests/regression/tools/base-path/test_ust b/tests/regression/tools/base-path/test_ust
index d60a2302ad21e45349c8b9c534c3c239d5dbfbfc..38a0877531c8ea94ace15f2000140f40a5e0cda9 100755 (executable)
--- a/tests/regression/tools/base-path/test_ust
+++ b/tests/regression/tools/base-path/test_ust
@@ -1,35 +1,23 @@
 #!/bin/bash
 #
-# Copyright (C) - 2019 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+# Copyright (C) 2019 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="Streaming Base Path Override - User space tracing"
 
-CURDIR=$(dirname $0)/
+CURDIR=$(dirname "$0")/
 TESTDIR=$CURDIR/../../..
-NR_ITER=5
-NR_USEC_WAIT=0
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 EVENT_NAME="tp:tptest"
 
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d tmp.test_base_path_ust_trace_path.XXXXXX)
 
-NUM_TESTS=37
+NUM_TESTS=42
 
-source $TESTDIR/utils/utils.sh
+source "$TESTDIR/utils/utils.sh"
 
 if [ ! -x "$TESTAPP_BIN" ]; then
        BAIL_OUT "No UST events binary detected."
@@ -37,7 +25,7 @@ fi
 
 function ust_app_stream_base_path ()
 {
-       local session_name=$(randstring 16 0)
+       local session_name="ust_app_stream_base_path"
        local base_path="my/custom/path1"
 
        diag "Test base path override for trace streaming"
@@ -52,16 +40,16 @@ function ust_app_stream_base_path ()
        destroy_lttng_session_ok $session_name
 
        # validate test
-       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$base_path
-       if [ $? -eq 0 ]; then
+       validate_trace_path_ust_uid_network "$TRACE_PATH" "" "$base_path"
+       if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
                # only delete if successful
-               rm -rf $TRACE_PATH
+               rm -rf "$TRACE_PATH"
        fi
 }
 
 function ust_app_snapshot_create_base_path ()
 {
-       local session_name=$(randstring 16 0)
+       local session_name="ust_app_snapshot_create_base_path"
        local base_path="my/custom/path2"
 
        diag "Test base path override for remote trace snapshot (URI on create)"
@@ -80,16 +68,16 @@ function ust_app_snapshot_create_base_path ()
        destroy_lttng_session_ok $session_name
 
        # validate test
-       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$base_path
-       if [ $? -eq 0 ]; then
+       validate_trace_path_ust_uid_snapshot_network "$TRACE_PATH" "" "snapshot-1" 0 "$base_path"
+       if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
                # only delete if successful
-               rm -rf $TRACE_PATH
+               rm -rf "$TRACE_PATH"
        fi
 }
 
 function ust_app_snapshot_base_path ()
 {
-       local session_name=$(randstring 16 0)
+       local session_name="ust_app_snapshot_base_path"
        local base_path="my/custom/path3"
 
        diag "Test base path override for remote trace snapshot (URI on snapshot)"
@@ -107,16 +95,16 @@ function ust_app_snapshot_base_path ()
        destroy_lttng_session_ok $session_name
 
        # validate test
-       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$base_path
-       if [ $? -eq 0 ]; then
+       validate_trace_path_ust_uid_snapshot_network "$TRACE_PATH" "" "snapshot-0" 0 "$base_path"
+       if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
                # only delete if successful
-               rm -rf $TRACE_PATH
+               rm -rf "$TRACE_PATH"
        fi
 }
 
 function ust_app_snapshot_add_output_base_path ()
 {
-       local session_name=$(randstring 16 0)
+       local session_name="ust_app_snapshot_add_output_base_path"
        local base_path="my/custom/path4"
 
        diag "Test base path override for remote trace snapshot (URI on add-output)"
@@ -135,10 +123,10 @@ function ust_app_snapshot_add_output_base_path ()
        destroy_lttng_session_ok $session_name
 
        # validate test
-       validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$base_path
-       if [ $? -eq 0 ]; then
+       validate_trace_path_ust_uid_snapshot_network "$TRACE_PATH" "" "snapshot-1" 0 "$base_path"
+       if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
                # only delete if successful
-               rm -rf $TRACE_PATH
+               rm -rf "$TRACE_PATH"
        fi
 }
 
@@ -157,6 +145,7 @@ function ust_app_stream_base_path_via_load ()
        destroy_lttng_session_ok $session_name
 
        # validate test
+       validate_trace_path_ust_uid_network "$TRACE_PATH" "" "$base_path"
        if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
                # only delete if successful
                rm -rf "$TRACE_PATH"
@@ -166,6 +155,7 @@ function ust_app_stream_base_path_via_load ()
 plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
+bail_out_if_no_babeltrace
 
 start_lttng_relayd "-o $TRACE_PATH"
 start_lttng_sessiond
@@ -176,7 +166,7 @@ tests=( ust_app_stream_base_path
        ust_app_snapshot_add_output_base_path
        ust_app_stream_base_path_via_load
 )
-for fct_test in ${tests[@]};
+for fct_test in "${tests[@]}";
 do
        ${fct_test}
 done