tests: fix shellcheck warning in plugins/src.ctf.lttng-live/test_live

[babeltrace.git] / tests / plugins / src.ctf.lttng-live / test_live

diff --git a/tests/plugins/src.ctf.lttng-live/test_live b/tests/plugins/src.ctf.lttng-live/test_live
index 20da1ae96edd0c689734f08aaa8923aed7fd97bb..b06a72ef123d370081cc0ba3eb25cd9a39179815 100755 (executable)
--- a/tests/plugins/src.ctf.lttng-live/test_live
+++ b/tests/plugins/src.ctf.lttng-live/test_live
@@ -139,8 +139,10 @@ get_cli_output_with_lttng_live_server() {
 
        cli_args=${cli_args_template//@PORT@/$port}
 
-       diag "Running CLI: 'babeltrace2 $cli_args'"
-       if ! "$BT_TESTS_BT2_BIN" $cli_args 1>"$cli_stdout_file" 2>"$cli_stderr_file"; then
+       # Split argument string by spaces into an array.
+       IFS=' ' read -ra cli_args <<< "$cli_args"
+
+       if ! bt_cli "$cli_stdout_file" "$cli_stderr_file" "${cli_args[@]}"; then
                # CLI failed: cancel everything else
                kill_lttng_live_server "$server_pid_file"
                wait
@@ -318,6 +320,8 @@ test_compare_to_ctf_fs() {
        expected_stderr="$(mktemp -t test_live_compare_stderr_expected.XXXXXX)"
 
        bt_cli "$expected_stdout" "$expected_stderr" "${trace_dir}/multi-domains" -c sink.text.details --params "with-trace-name=false,with-stream-name=false"
+       bt_remove_cr "${expected_stdout}"
+       bt_remove_cr "${expected_stderr}"
        run_test "$test_text" "$cli_args_template" "$server_args" "$expected_stdout" "$expected_stderr"
        diag "Inverse session order from lttng-relayd"
        run_test "$test_text" "$cli_args_template" "$server_args_inverse" "$expected_stdout" "$expected_stderr"