From b2f4c4fadc015bd2506d6940082a61683e565f1a Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 22 Oct 2019 12:05:28 -0400 Subject: [PATCH] Tests: fix: tmp dir can be a symlink MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Get the real path to perform valid comparison. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- .../test_relayd_working_directory | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/regression/tools/working-directory/test_relayd_working_directory b/tests/regression/tools/working-directory/test_relayd_working_directory index 8a261af21..956cb780a 100755 --- a/tests/regression/tools/working-directory/test_relayd_working_directory +++ b/tests/regression/tools/working-directory/test_relayd_working_directory @@ -37,7 +37,7 @@ function test_relayd() local pid local cwd - working_dir=$(mktemp -d) + working_dir=$(realpath "$(mktemp -d)") diag "Test lttng-relayd normal mode change working directory" @@ -72,7 +72,7 @@ function test_relayd_daemon() local cwd local pid - working_dir=$(mktemp -d) + working_dir=$(realpath "$(mktemp -d)") diag "Test lttng-relayd daemon mode change working directory" @@ -116,7 +116,7 @@ function test_relayd_background() local cwd local pid - working_dir=$(mktemp -d) + working_dir=$(realpath "$(mktemp -d)") diag "Test lttng-relayd background mode change working directory" @@ -161,7 +161,7 @@ function test_relayd_debug_permission() local cwd local pid - working_dir=$(mktemp -d) + working_dir=$(realpath "$(mktemp -d)") diag "Test lttng-relayd change working directory on non writable directory" @@ -197,7 +197,7 @@ function test_relayd_failure() local output_dest local pid - working_dir="$(mktemp -d)" + working_dir=$(realpath "$(mktemp -d)") working_dir_imaginary="${working_dir}/imaginary_directory" output_dest=$(mktemp) @@ -229,6 +229,7 @@ function test_relayd_env() local pid working_dir=$(mktemp -d) + working_dir=$(realpath "$(mktemp -d)") diag "Test lttng-relayd change working directory from env. variable" @@ -254,8 +255,8 @@ function test_relayd_cmdline_overwrite_env() local cwd local pid - working_dir_env=$(mktemp -d) - working_dir_cmdline=$(mktemp -d) + working_dir_env=$(realpath "$(mktemp -d)") + working_dir_cmdline=$(realpath "$(mktemp -d)") diag "Test lttng-relayd change working directory command line overwrite env variable" -- 2.34.1