X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flibc-wrapper%2Ftest_libc-wrapper.py;h=f56fa50def85e4aa8ac3bfafa2d233ceb9b7a2d1;hb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;hp=d45b71addeeae8b87f00b2cd54f3d62b7fd22f8c;hpb=5836cdc2ccafa85a1813d5740133e8b652cfa7e3;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 d45b71add..f56fa50de 100644
--- a/tests/regression/ust/libc-wrapper/test_libc-wrapper.py
+++ b/tests/regression/ust/libc-wrapper/test_libc-wrapper.py
@@ -1,19 +1,8 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+# Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# SPDX-License-Identifier: GPL-2.0-only
 
 import os
 import subprocess
@@ -39,18 +28,11 @@ if session_daemon_alive() == 0:
     bail("No sessiond running. Please make sure you are running this test with the \"run\" shell script and verify that the lttng tools are properly installed.")
 
 session_info = create_session()
-enable_ust_tracepoint_event(session_info, "ust_libc*")
+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
@@ -72,10 +54,10 @@ for event_line in babeltrace_process.stdout:
         continue
 
     event_line = event_line.decode('utf-8').replace("\n", "")
-    if re.search(r".*ust_libc:malloc.*", event_line) is not None:
+    if re.search(r".*lttng_ust_libc:malloc.*", event_line) is not None:
         malloc_event_found = True
 
-    if re.search(r".*ust_libc:free.*", event_line) is not None:
+    if re.search(r".*lttng_ust_libc:free.*", event_line) is not None:
         free_event_found = True
 
 babeltrace_process.wait()
@@ -83,10 +65,10 @@ 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, "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, "ust_libc:free event found in resulting trace")
+print_test_result(free_event_found, current_test, "lttng_ust_libc:free event found in resulting trace")
 current_test += 1
 
 shutil.rmtree(session_info.tmp_directory)