Backport: Introduce LTTNG_RELAYD_WORKING_DIRECTORY environment variable

[lttng-tools.git] / tests / regression / tools / working-directory / test_relayd_workding_directory

diff --git a/tests/regression/tools/working-directory/test_relayd_workding_directory b/tests/regression/tools/working-directory/test_relayd_workding_directory
index 2422ea8c0393042b9599b5121450a6671d5aba97..bf486893fc6b8f13519503793b26b662710403fd 100755 (executable)
--- a/tests/regression/tools/working-directory/test_relayd_workding_directory
+++ b/tests/regression/tools/working-directory/test_relayd_workding_directory
@@ -22,11 +22,10 @@ TESTDIR=$CURDIR/../../../
 
 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
 
@@ -181,6 +180,42 @@ function test_relayd_failure()
        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
@@ -189,6 +224,8 @@ TESTS=(
        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[@]};