Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix: update regression tests involving UST #11

Closed
wants to merge 1 commit into from
Closed

Fix: update regression tests involving UST #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tests/regression/tools/mi/test_mi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions tests/regression/ust/libc-wrapper/test_libc-wrapper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
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)
Expand Down Expand Up @@ -72,21 +72,21 @@
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()

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)