Tests: fix shellcheck warning

[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 d7e324e7baff74b470b807b19ed49b95ff047479..84d4345510207c5104b06554b1cad564c6100fe6 100755 (executable)
--- a/tests/regression/tools/base-path/test_ust
+++ b/tests/regression/tools/base-path/test_ust
@@ -16,10 +16,8 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 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"
@@ -27,9 +25,9 @@ EVENT_NAME="tp:tptest"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=32
+NUM_TESTS=37
 
-source $TESTDIR/utils/utils.sh
+source "$TESTDIR/utils/utils.sh"
 
 if [ ! -x "$TESTAPP_BIN" ]; then
        BAIL_OUT "No UST events binary detected."
@@ -37,7 +35,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 +50,15 @@ 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
+       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 +77,15 @@ 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
+       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,17 +103,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
+       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 base_path="my/custom/path3"
+       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)"
        create_lttng_session_no_output $session_name --snapshot
@@ -135,10 +130,30 @@ 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
+       if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
+               # only delete if successful
+               rm -rf "$TRACE_PATH"
+       fi
+}
+
+function ust_app_stream_base_path_via_load ()
+{
+       local session_name="load-stream-extra-path"
+       local base_path="my/custom/path5"
+
+       diag "Test base path override for trace streaming using lttng load"
+       lttng_load_ok "-i $CURDIR/$session_name.lttng"
+       start_lttng_tracing_ok $session_name
+
+       $TESTAPP_BIN > /dev/null 2>&1
+
+       stop_lttng_tracing_ok $session_name
+       destroy_lttng_session_ok $session_name
+
+       # validate test
+       if validate_trace $EVENT_NAME "$TRACE_PATH/$HOSTNAME/$base_path"; then
                # only delete if successful
-               rm -rf $TRACE_PATH
+               rm -rf "$TRACE_PATH"
        fi
 }
 
@@ -152,8 +167,10 @@ start_lttng_sessiond
 tests=( ust_app_stream_base_path
        ust_app_snapshot_create_base_path
        ust_app_snapshot_base_path
-       ust_app_snapshot_add_output_base_path )
-for fct_test in ${tests[@]};
+       ust_app_snapshot_add_output_base_path
+       ust_app_stream_base_path_via_load
+)
+for fct_test in "${tests[@]}";
 do
        ${fct_test}
 done