From: Antoine Busque Date: Wed, 27 May 2015 19:09:18 +0000 (-0400) Subject: Fix: update regression tests involving UST X-Git-Tag: v2.7.0-rc1~30 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=50a7461754605f14987d6bab5d83f63950beba4f;p=lttng-tools.git Fix: update regression tests involving UST This patch fixes previously failing regression tests which involve either the UST statedump or helper events, following a refactor and rename. Signed-off-by: Antoine Busque Signed-off-by: Jérémie Galarneau --- diff --git a/tests/regression/tools/mi/test_mi b/tests/regression/tools/mi/test_mi index 3ee2e74f7..ccf92363f 100755 --- a/tests/regression/tools/mi/test_mi +++ b/tests/regression/tools/mi/test_mi @@ -511,11 +511,11 @@ function test_list_ust_event () $XML_VALIDATE $OUTPUT_DEST ok $? "Mi test: list ust event xsd validation" - #Extract events 3 events should be present + #Extract events 5 events should be present extract_xml $OUTPUT_DEST "$XPATH_LIST_UST_EVENT""/name/text()" result num=$(echo "$result" | wc -l) - test "$num" -eq "3" - ok $? "Mi test: $num / 3 ust events discovered" + test "$num" -eq "5" + ok $? "Mi test: $num / 5 ust events discovered" #Extract field from tp:tptest event. Expect 12 extract_xml $OUTPUT_DEST "$XPATH_LIST_UST_EVENT""[./name = 'tp:tptest']/event_fields/event_field/name/text()" result diff --git a/tests/regression/ust/libc-wrapper/test_libc-wrapper.py b/tests/regression/ust/libc-wrapper/test_libc-wrapper.py index d45b71add..9f717db31 100644 --- a/tests/regression/ust/libc-wrapper/test_libc-wrapper.py +++ b/tests/regression/ust/libc-wrapper/test_libc-wrapper.py @@ -39,7 +39,7 @@ 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) @@ -72,10 +72,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 +83,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(free_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)