Specify the --port-file and --trace-path-prefix arguments in function
get_cli_output_with_lttng_live_server rather than function
lttng_live_server.
Change-Id: Iddb781b8a085b85468f4148708409c774c79893f
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/10917
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
local server_script="$test_data_dir/lttng_live_server.py"
# start server
local server_script="$test_data_dir/lttng_live_server.py"
# start server
- diag "$BT_TESTS_PYTHON_BIN $server_script --port-file $port_file --trace-path-prefix $trace_dir_native $server_args"
- echo "$server_args" | run_python xargs "$BT_TESTS_PYTHON_BIN" "$server_script" \
- --port-file "$port_file" \
- --trace-path-prefix "$trace_dir_native" 1>&2 &
+ diag "$BT_TESTS_PYTHON_BIN $server_script $server_args"
+ echo "$server_args" | run_python xargs "$BT_TESTS_PYTHON_BIN" "$server_script" 1>&2 &
# write PID to file
echo $! > "$pid_file"
# write PID to file
echo $! > "$pid_file"
get_cli_output_with_lttng_live_server() {
local cli_args_template="$1"
get_cli_output_with_lttng_live_server() {
local cli_args_template="$1"
- local sessions_file="$2"
local cli_stdout_file="$3"
local cli_stderr_file="$4"
local port_file="$5"
local cli_stdout_file="$3"
local cli_stderr_file="$4"
local port_file="$5"
local cli_args
local server_pid_file
local server_retcode_file
local cli_args
local server_pid_file
local server_retcode_file
+
+ server_args="--port-file $port_file --trace-path-prefix \"$trace_dir_native\" $server_args"
server_pid_file="$(mktemp -t test_live_server_pid.XXXXXX)"
server_retcode_file="$(mktemp -t test_live_server_ret.XXXXX)"
server_pid_file="$(mktemp -t test_live_server_pid.XXXXXX)"
server_retcode_file="$(mktemp -t test_live_server_ret.XXXXX)"
# lttng_live_server() writes its return code to the
# `$server_retcode_file` file.
lttng_live_server "$port_file" "$server_pid_file" \
# lttng_live_server() writes its return code to the
# `$server_retcode_file` file.
lttng_live_server "$port_file" "$server_pid_file" \
- "$server_retcode_file" "$sessions_file" &
+ "$server_retcode_file" "$server_args" &