start_session(session_info)
test_env = os.environ.copy()
-test_env["LD_PRELOAD"] = "liblttng-ust-dl.so"
-test_env["LD_LIBRARY_PATH"] = test_path + ".libs/"
+test_env["LD_PRELOAD"] = test_env.get("LD_PRELOAD", "") + ":liblttng-ust-dl.so"
+test_env["LD_LIBRARY_PATH"] = test_env.get("LD_LIBRARY_PATH", "") + ":" + test_path
test_process = subprocess.Popen(test_path + "prog",
- stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+ stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL,
env=test_env)
-
-if sys.version_info >= (3, 3):
- try:
- test_process.wait(5)
- except subprocess.TimeoutExpired:
- test_process.kill()
- bail("Failed to run ust-dl test application.", session_info)
-else:
- test_process.wait()
+test_process.wait()
print_test_result(test_process.returncode == 0, current_test, "Test application exited normally")
current_test += 1