X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flibc-wrapper%2Ftest_libc-wrapper.py;h=545d5662f3030ef64d2e7880f984c6f855a55328;hb=707de922fab70af1b4238c33359b77d1ebd1ee34;hp=9f717db31bddb715c53eca5559c9f1e60c7fe033;hpb=50a7461754605f14987d6bab5d83f63950beba4f;p=lttng-tools.git diff --git a/tests/regression/ust/libc-wrapper/test_libc-wrapper.py b/tests/regression/ust/libc-wrapper/test_libc-wrapper.py index 9f717db31..545d5662f 100644 --- a/tests/regression/ust/libc-wrapper/test_libc-wrapper.py +++ b/tests/regression/ust/libc-wrapper/test_libc-wrapper.py @@ -43,14 +43,7 @@ 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.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")