tests: Move to kernel style SPDX license identifiers

[lttng-tools.git] / tests / regression / ust / baddr-statedump / test_baddr-statedump.py

diff --git a/tests/regression/ust/baddr-statedump/test_baddr-statedump.py b/tests/regression/ust/baddr-statedump/test_baddr-statedump.py
index 47ed9d6156b5a61a16e7b2f9730859aa1cb44e49..026f084445e8ec9d24e06854dfc021f96b8eb755 100644 (file)
--- a/tests/regression/ust/baddr-statedump/test_baddr-statedump.py
+++ b/tests/regression/ust/baddr-statedump/test_baddr-statedump.py
@@ -1,20 +1,9 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) - 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
-# Copyright (C) - 2015 Antoine Busque <abusque@efficios.com>
+# Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
+# Copyright (C) 2015 Antoine Busque <abusque@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
@@ -45,15 +34,8 @@ session_info = create_session()
 enable_ust_tracepoint_event(session_info, "*")
 start_session(session_info)
 
-test_process = subprocess.Popen(test_path + "prog.strip", stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-if sys.version_info >= (3, 3):
-    try:
-        test_process.wait(5)
-    except subprocess.TimeoutExpired:
-        test_process.kill()
-        bail("Failed to run ust baddr-statedump test application.", session_info)
-else:
-    test_process.wait()
+test_process = subprocess.Popen(test_path + "prog.strip", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+test_process.wait()
 
 print_test_result(test_process.returncode == 0, current_test, "Test application exited normally")
 current_test += 1
@@ -67,22 +49,22 @@ except FileNotFoundError:
     bail("Could not open babeltrace. Please make sure it is installed.", session_info)
 
 start_event_found = False
-soinfo_event_found = False
+bin_info_event_found = False
 build_id_event_found = False
 debug_link_event_found = False
 end_event_found = False
 
 for event_line in babeltrace_process.stdout:
     # Let babeltrace finish to get the return code
-    if start_event_found and soinfo_event_found and build_id_event_found and \
+    if start_event_found and bin_info_event_found and build_id_event_found and \
        debug_link_event_found and end_event_found:
         continue
 
     event_line = event_line.decode('utf-8').replace("\n", "")
     if re.search(r".*lttng_ust_statedump:start.*", event_line) is not None:
         start_event_found = True
-    elif re.search(r".*lttng_ust_statedump:soinfo.*", event_line) is not None:
-        soinfo_event_found = True
+    elif re.search(r".*lttng_ust_statedump:bin_info.*", event_line) is not None:
+        bin_info_event_found = True
     elif re.search(r".*lttng_ust_statedump:build_id.*", event_line) is not None:
         build_id_event_found = True
     elif re.search(r".*lttng_ust_statedump:debug_link.*", event_line) is not None:
@@ -98,7 +80,7 @@ current_test += 1
 print_test_result(start_event_found, current_test, "lttng_ust_statedump:start event found in resulting trace")
 current_test += 1
 
-print_test_result(soinfo_event_found, current_test, "lttng_ust_statedump:soinfo event found in resulting trace")
+print_test_result(bin_info_event_found, current_test, "lttng_ust_statedump:bin_info event found in resulting trace")
 current_test += 1
 
 print_test_result(build_id_event_found, current_test, "lttng_ust_statedump:build_id event found in resulting trace")