X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Flinking%2Ftest_linking.py;h=264747ea68aeca8f8742ad46cbc3d36ac89b280e;hb=cc22de985fbd6c192a021063fc3be165dd6fa5c0;hp=9591312935894bdf2fc22b3932ab8fac01fb15e7;hpb=91c7528576191398299e36d4ac061b8a0076a643;p=lttng-tools.git

diff --git a/tests/regression/ust/linking/test_linking.py b/tests/regression/ust/linking/test_linking.py
index 959131293..264747ea6 100644
--- a/tests/regression/ust/linking/test_linking.py
+++ b/tests/regression/ust/linking/test_linking.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
@@ -110,21 +99,15 @@ if DYNAMIC_TEST_ENABLED:
     start_session(session_info)
 
     # Dry run, no events should be logged
-    demo_process = subprocess.Popen(test_path + "demo", stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    if sys.version_info >= (3 ,3):
-        try:
-            demo_process.wait(5)
-        except TimeoutExpired:
-            demo_process.kill()
-            bail("Failed to run demo test application without preloading")
-    else:
-        demo_process.wait()
+    demo_process = subprocess.Popen(test_path + "demo", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    demo_process.wait()
     stop_session(session_info)
 
     print_test_result(demo_process.returncode == 0, current_test,\
                           "Running application dynamically linked to providers, no preload")
     current_test += 1
-    print_test_result(not os.path.exists(session_info.trace_path), current_test,\
+    trace_path = os.path.join(session_info.trace_path, "ust", "uid")
+    print_test_result(not os.path.exists(trace_path), current_test,\
                           "No events logged when running demo application without preloading providers")
     current_test += 1
 
@@ -136,15 +119,8 @@ for executable in test_executables:
     enable_ust_tracepoint_event(session_info, "ust_tests_demo*")
     start_session(session_info)
 
-    demo_process = subprocess.Popen(executable, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-    if sys.version_info >= (3, 3):
-        try:
-            demo_process.wait(5)
-        except TimeoutExpired:
-            demo_process.kill()
-            bail("Failed to run {0} test application".format(executable_name))
-    else:
-        demo_process.wait()
+    demo_process = subprocess.Popen(executable, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    demo_process.wait()
     stop_session(session_info)
 
     trace_found = os.path.exists(session_info.trace_path)
@@ -157,9 +133,9 @@ for executable in test_executables:
         continue
 
     try:
-        babeltrace_process = subprocess.Popen(["babeltrace", session_info.trace_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        babeltrace_process = subprocess.Popen([BABELTRACE_BIN, session_info.trace_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     except FileNotFoundError:
-        bail("Could not open babeltrace. Please make sure it is installed.")
+        bail("Could not open {}. Please make sure it is installed.".format(BABELTRACE_BIN))
 
     # We should find 8 events in the resulting trace
     event_entries = []