Commit bd80c4d6 authored by Thomas Weißschuh's avatar Thomas Weißschuh Committed by Shuah Khan
Browse files

kunit: tool: Parse skipped tests from kselftest.h 

Skipped tests reported by kselftest.h use a different format than KTAP,
there is no explicit test name. Normally the test name is part of the
free-form string after the SKIP keyword:

	ok 3 # SKIP test: some reason

Extend the parser to handle those correctly. Use the free-form string as
test name instead.

Link: https://lore.kernel.org/r/20250813-kunit-kselftesth-skip-v1-1-57ae3de4f109@linutronix.de


Signed-off-by: default avatarThomas Weißschuh <thomas.weissschuh@linutronix.de>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 29128da2

tools/testing/kunit/kunit_parser.py

+5 −3
Original line number Diff line number Diff line
@@ -352,9 +352,9 @@ def parse_test_plan(lines: LineStream, test: Test) -> bool: 
	lines.pop()

	return True



TEST_RESULT = re.compile(r'^\s*(ok|not ok) ([0-9]+) (- )?([^#]*)( # .*)?$')

TEST_RESULT = re.compile(r'^\s*(ok|not ok) ([0-9]+) ?(- )?([^#]*)( # .*)?$')



TEST_RESULT_SKIP = re.compile(r'^\s*(ok|not ok) ([0-9]+) (- )?(.*) # SKIP(.*)$')

TEST_RESULT_SKIP = re.compile(r'^\s*(ok|not ok) ([0-9]+) ?(- )?(.*) # SKIP ?(.*)$')



def peek_test_name_match(lines: LineStream, test: Test) -> bool:

	"""
@@ -379,6 +379,8 @@ def peek_test_name_match(lines: LineStream, test: Test) -> bool: 
	if not match:

		return False

	name = match.group(4)

	if not name:

		return False

	return name == test.name



def parse_test_result(lines: LineStream, test: Test,
@@ -416,7 +418,7 @@ def parse_test_result(lines: LineStream, test: Test, 


	# Set name of test object

	if skip_match:

		test.name = skip_match.group(4)

		test.name = skip_match.group(4) or skip_match.group(5)

	else:

		test.name = match.group(4)

tools/testing/kunit/test_data/test_is_test_passed-kselftest.log

+2 −1
Original line number Diff line number Diff line 
TAP version 13

1..2

1..3

# selftests: membarrier: membarrier_test_single_thread

# TAP version 13

# 1..2
@@ -12,3 +12,4 @@ ok 1 selftests: membarrier: membarrier_test_single_thread 
# ok 1 sys_membarrier available

# ok 2 sys membarrier invalid command test: command = -1, flags = 0, errno = 22. Failed as expected

ok 2 selftests: membarrier: membarrier_test_multi_thread

ok 3 # SKIP selftests: membarrier: membarrier_test_multi_thread