From db4e2b3e3c9a578a456916f13506012061d919fd Mon Sep 17 00:00:00 2001 From: Antoine Busque Date: Wed, 20 Apr 2016 15:57:35 -0400 Subject: [PATCH] Fix: update tests following renaming of UST statedump event MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes regression tests that failed due to the renaming of `lttng_ust_statedump:soinfo` to `lttng_ust_statedump:bin_info`. Signed-off-by: Antoine Busque Signed-off-by: Jérémie Galarneau --- tests/regression/ust/baddr-statedump/README | 2 +- .../ust/baddr-statedump/test_baddr-statedump.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/regression/ust/baddr-statedump/README b/tests/regression/ust/baddr-statedump/README index bfc6f3ce6..e53b9b6f9 100644 --- a/tests/regression/ust/baddr-statedump/README +++ b/tests/regression/ust/baddr-statedump/README @@ -20,7 +20,7 @@ compiled with debug information, which is then copied into a separate `prog.debug` file, and a debug link section is added to the original `prog` executable, now stripped of debug information. This ensures that `lttng_ust_statedump:debug_link` event will be produced. The -events `start`, `soinfo`, `build_id`, and `end` from the same provider +events `start`, `bin_info`, `build_id`, and `end` from the same provider are also expected in the trace and verified by the test. DEPENDENCIES diff --git a/tests/regression/ust/baddr-statedump/test_baddr-statedump.py b/tests/regression/ust/baddr-statedump/test_baddr-statedump.py index 47ed9d615..723eb1ba6 100644 --- a/tests/regression/ust/baddr-statedump/test_baddr-statedump.py +++ b/tests/regression/ust/baddr-statedump/test_baddr-statedump.py @@ -67,22 +67,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 +98,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") -- 2.34.1