projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test fix: redirect python test subprocess output to /dev/null
[lttng-tools.git]
/
tests
/
regression
/
ust
/
ust-dl
/
test_ust-dl.py
diff --git
a/tests/regression/ust/ust-dl/test_ust-dl.py
b/tests/regression/ust/ust-dl/test_ust-dl.py
index 1e5e96bb99bb119238998070fd7b5b1f09ca0f11..41d197c0c28a9af1c404cdf98e612ee6905523a9 100644
(file)
--- a/
tests/regression/ust/ust-dl/test_ust-dl.py
+++ b/
tests/regression/ust/ust-dl/test_ust-dl.py
@@
-46,20
+46,12
@@
enable_ust_tracepoint_event(session_info, "*")
start_session(session_info)
test_env = os.environ.copy()
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",
test_process = subprocess.Popen(test_path + "prog",
- stdout=subprocess.
PIPE, stderr=subprocess.PIPE
,
+ stdout=subprocess.
DEVNULL, stderr=subprocess.DEVNULL
,
env=test_env)
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
print_test_result(test_process.returncode == 0, current_test, "Test application exited normally")
current_test += 1
This page took
0.030186 seconds
and
4
git commands to generate.