X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Fust%2Ftype-declarations%2Ftest_type_declarations.py;h=da2f57987f7aa40818fb25b5de66b111730b34f0;hb=4881bba88a421d8e7f41d58feb88b4ca459af87d;hp=b2fa282a182b8efc2bbf24603ec7477e777c3075;hpb=b6e2447a0a8d7fcd62c9c592082f5543eb10ade4;p=lttng-tools.git diff --git a/tests/regression/ust/type-declarations/test_type_declarations.py b/tests/regression/ust/type-declarations/test_type_declarations.py index b2fa282a1..da2f57987 100644 --- a/tests/regression/ust/type-declarations/test_type_declarations.py +++ b/tests/regression/ust/type-declarations/test_type_declarations.py @@ -29,7 +29,7 @@ test_utils_path = test_utils_path + "/utils" sys.path.append(test_utils_path) from test_utils import * -NR_TESTS = 9 +NR_TESTS = 10 current_test = 1 print("1..{0}".format(NR_TESTS)) @@ -70,10 +70,10 @@ current_test += 1 if babeltrace_process.returncode != 0: bail("Unreadable trace; can't proceed with analysis.") -print_test_result(len(event_lines) == 4, current_test, "Correct number of events found in resulting trace") +print_test_result(len(event_lines) == 5, current_test, "Correct number of events found in resulting trace") current_test += 1 -if len(event_lines) != 4: +if len(event_lines) != 5: bail("Unexpected number of events found in resulting trace (" + session_info.trace_path + ")." ) match = re.search(r".*ust_tests_td:(.*):.*enumfield = \( \"(.*)\" :.*enumfield_bis = \( \"(.*)\" :.*enumfield_third = .*:.*", event_lines[0]) @@ -102,5 +102,9 @@ match = re.search(r".*ust_tests_td:(.*):.*enumfield = \( \"(.*)\" :.*enumfield_b print_test_result(match is not None and match.group(2) == "one", current_test,\ "Third tracepoint's enum value maps to one") +current_test += 1 + +print_test_result('{ zero = ( "zero" : container = 0 ), two = ( "two" : container = 2 ), three = ( "three" : container = 3 ), fifteen = ( "ten_to_twenty" : container = 15 ), twenty_one = ( "twenty_one" : container = 21 ) }' in event_lines[4], + current_test, 'Auto-incrementing enum values are correct') shutil.rmtree(session_info.tmp_directory)