Gen-ust-events: use options instead of arguments

[lttng-tools.git] / tests / regression / ust / libc-wrapper / test_libc-wrapper.py

diff --git a/tests/regression/ust/libc-wrapper/test_libc-wrapper.py b/tests/regression/ust/libc-wrapper/test_libc-wrapper.py
index 9f717db31bddb715c53eca5559c9f1e60c7fe033..2870c81c1e47b743a6923aa742df3bc7115fc9d8 100644 (file)
--- a/tests/regression/ust/libc-wrapper/test_libc-wrapper.py
+++ b/tests/regression/ust/libc-wrapper/test_libc-wrapper.py
@@ -42,15 +42,8 @@ session_info = create_session()
 enable_ust_tracepoint_event(session_info, "lttng_ust_libc*")
 start_session(session_info)
 
-malloc_process = subprocess.Popen(test_path + "prog", stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-if sys.version_info >= (3, 3):
-    try:
-        malloc_process.wait(5)
-    except TimeoutExpired:
-        malloc_process.kill()
-        bail("Failed to run libustinstr-malloc test application.", session_info)
-else:
-    malloc_process.wait()
+malloc_process = subprocess.Popen(test_path + "prog", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+malloc_process.wait()
 
 print_test_result(malloc_process.returncode == 0, current_test, "Test application exited normally")
 current_test += 1
@@ -83,7 +76,7 @@ babeltrace_process.wait()
 print_test_result(babeltrace_process.returncode == 0, current_test, "Resulting trace is readable")
 current_test += 1
 
-print_test_result(free_event_found, current_test, "lttng_ust_libc:malloc event found in resulting trace")
+print_test_result(malloc_event_found, current_test, "lttng_ust_libc:malloc event found in resulting trace")
 current_test += 1
 
 print_test_result(free_event_found, current_test, "lttng_ust_libc:free event found in resulting trace")