Fix: test: append to LD_LIBRARY_PATH
authorJonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Thu, 14 Jan 2016 20:08:22 +0000 (15:08 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Thu, 14 Jan 2016 20:23:53 +0000 (15:23 -0500)
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 <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
tests/regression/ust/ust-dl/test_ust-dl.py

index dc7327017f6f8d6ddf179ad337b1ef2f6b8f79b0..7117ca1b343ed8f9568c63f410defbe8d66e2616 100644 (file)
@@ -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)
This page took 0.025764 seconds and 4 git commands to generate.