Commit a2458824 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux_kselftest-kunit-6.15-rc2' of... 

Merge tag 'linux_kselftest-kunit-6.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kunit fixes from Shuah Khan:

 - Fix the tool to report test count in case of a late test plan when
   tests are specified before the test plan

 - Fix spelling error

* tag 'linux_kselftest-kunit-6.15-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  kunit: Spelling s/slowm/slow/
  kunit: tool: fix count of tests if late test plan
parents 0e886324 d1be0cf3

include/kunit/test.h

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ enum kunit_status { 


/*

 * Speed Attribute is stored as an enum and separated into categories of

 * speed: very_slowm, slow, and normal. These speeds are relative to

 * speed: very_slow, slow, and normal. These speeds are relative to

 * other KUnit tests.

 *

 * Note: unset speed attribute acts as default of KUNIT_SPEED_NORMAL.

tools/testing/kunit/kunit_parser.py

+4 −0
Original line number Diff line number Diff line
@@ -809,6 +809,10 @@ def parse_test(lines: LineStream, expected_num: int, log: List[str], is_subtest: 
		test.log.extend(parse_diagnostic(lines))

		if test.name != "" and not peek_test_name_match(lines, test):

			test.add_error(printer, 'missing subtest result line!')

		elif not lines:

			print_log(test.log, printer)

			test.status = TestStatus.NO_TESTS

			test.add_error(printer, 'No more test results!')

		else:

			parse_test_result(lines, test, expected_num, printer)

tools/testing/kunit/kunit_tool_test.py

+2 −2
Original line number Diff line number Diff line
@@ -371,8 +371,8 @@ class KUnitParserTest(unittest.TestCase): 
		"""

		result = kunit_parser.parse_run_tests(output.splitlines(), stdout)

		# Missing test results after test plan should alert a suspected test crash.

		self.assertEqual(kunit_parser.TestStatus.TEST_CRASHED, result.status)

		self.assertEqual(result.counts, kunit_parser.TestCounts(passed=1, crashed=1, errors=1))

		self.assertEqual(kunit_parser.TestStatus.SUCCESS, result.status)

		self.assertEqual(result.counts, kunit_parser.TestCounts(passed=1, errors=2))



def line_stream_from_strs(strs: Iterable[str]) -> kunit_parser.LineStream:

	return kunit_parser.LineStream(enumerate(strs, start=1))