DIR=$(readlink -f $TESTDIR)
-NUM_TESTS=22
+NUM_TESTS=28
source $TESTDIR/utils/utils.sh
-
#MUST set TESTDIR before calling those functions
plan_tests $NUM_TESTS
rm -rf ${working_dir} ${output_dest}
}
+function test_relayd_env()
+{
+ local working_dir=$(mktemp -d)
+
+ diag "Test lttng-relayd change working directory from env. variable"
+
+ export LTTNG_RELAYD_WORKING_DIRECTORY=${working_dir}
+ start_lttng_relayd_opt 1 "-b" ""
+
+ local cwd=$(readlink /proc/${RELAYD_PIDS}/cwd)
+
+ is "x${cwd}" "x${working_dir}" "Working directory changed"
+
+ stop_lttng_relayd
+ rm -rf ${working_dir}
+ unset LTTNG_RELAYD_WORKING_DIRECTORY
+}
+
+function test_relayd_cmdline_overwrite_env()
+{
+ local working_dir_env=$(mktemp -d)
+ local working_dir_cmdline=$(mktemp -d)
+
+ diag "Test lttng-relayd change working directory command line overwrite env variable"
+
+ export LTTNG_RELAYD_WORKING_DIRECTORY=${working_dir_env}
+ start_lttng_relayd_opt 1 "-b" "--working-dir ${working_dir_cmdline}"
+
+ local cwd=$(readlink /proc/${RELAYD_PIDS}/cwd)
+
+ is "x${cwd}" "x${working_dir_cmdline}" "Working directory is the one from command line"
+
+ stop_lttng_relayd
+ rm -rf ${working_dir_env} ${working_dir_cmdline}
+ unset LTTNG_RELAYD_WORKING_DIRECTORY
+}
TESTS=(
test_relayd
test_relayd_daemon
test_relayd_background_no_working_dir
test_relayd_debug_permission
test_relayd_failure
+ test_relayd_env
+ test_relayd_cmdline_overwrite_env
)
for fct_test in ${TESTS[@]};