Tests: use babeltrace2 for all tests

[lttng-tools.git] / tests / regression / ust / fork / test_fork.py

diff --git a/tests/regression/ust/fork/test_fork.py b/tests/regression/ust/fork/test_fork.py
index 62faf71f1ad121ded11c65e321f269a2a59492a5..3c9a2ea91e538e0d781fe6fb826754894dc94252 100644 (file)
--- a/tests/regression/ust/fork/test_fork.py
+++ b/tests/regression/ust/fork/test_fork.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
@@ -43,16 +32,6 @@ enable_ust_tracepoint_event(session_info, "ust_tests_fork*")
 start_session(session_info)
 
 fork_process = subprocess.Popen([test_path + "fork", test_path + "fork2"], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-
-if sys.version_info >= (3, 3):
-    try:
-        fork_process.wait(5)
-    except TimeoutExpired:
-        fork_process.kill()
-        bail("Failed to run fork test application (time out)", session_info)
-else:
-    fork_process.wait()
-
 parent_pid = -1
 child_pid = -1
 for line in fork_process.stdout:
@@ -64,6 +43,8 @@ for line in fork_process.stdout:
     if match:
         parent_pid = match.group(1)
 
+fork_process.wait()
+
 print_test_result(fork_process.returncode == 0, current_test, "Fork test application exited normally")
 current_test += 1
 
@@ -71,9 +52,9 @@ stop_session(session_info)
 
 # Check both events (normal exit and suicide messages) are present in the resulting trace
 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.", session_info)
+    bail("Could not open {}. Please make sure it is installed.".format(BABELTRACE_BIN))
 
 event_lines = []
 for event_line in babeltrace_process.stdout: