From: Jonathan Rajotte Date: Thu, 14 Jan 2016 20:08:22 +0000 (-0500) Subject: Fix: test: append to LD_LIBRARY_PATH X-Git-Tag: v2.8.0-rc1~191 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=d1e2f4ebd1c8894756d7a595593055883962b58f;hp=e4f8013bd2dadd7f44f8b70e15800193728e2dea Fix: test: append to LD_LIBRARY_PATH The overwriting of LD_LIBRARY_PATH can cause failure of tests when lttng-ust is not installed in the default path and location is passed via LD_LIBRARY_PATH. Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau --- diff --git a/tests/regression/ust/ust-dl/test_ust-dl.py b/tests/regression/ust/ust-dl/test_ust-dl.py index dc7327017..7117ca1b3 100644 --- a/tests/regression/ust/ust-dl/test_ust-dl.py +++ b/tests/regression/ust/ust-dl/test_ust-dl.py @@ -46,8 +46,8 @@ enable_ust_tracepoint_event(session_info, "*") start_session(session_info) test_env = os.environ.copy() -test_env["LD_PRELOAD"] = "liblttng-ust-dl.so" -test_env["LD_LIBRARY_PATH"] = test_path +test_env["LD_PRELOAD"] += ":liblttng-ust-dl.so" +test_env["LD_LIBRARY_PATH"] += ":" + test_path test_process = subprocess.Popen(test_path + "prog", stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=test_env)