Skip to content

Commit 7acac4b

Browse files
committed
Merge tag 'linux-kselftest-kunit-fixes-5.12-rc5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull KUnit fixes from Shuah Khan: "Two fixes to the kunit tool from David Gow" * tag 'linux-kselftest-kunit-fixes-5.12-rc5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: kunit: tool: Disable PAGE_POISONING under --alltests kunit: tool: Fix a python tuple typing error
2 parents 8419639 + 7fd53f4 commit 7acac4b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

tools/testing/kunit/configs/broken_on_uml.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,5 @@
4040
# CONFIG_RESET_BRCMSTB_RESCAL is not set
4141
# CONFIG_RESET_INTEL_GW is not set
4242
# CONFIG_ADI_AXI_ADC is not set
43+
# CONFIG_DEBUG_PAGEALLOC is not set
44+
# CONFIG_PAGE_POISONING is not set

tools/testing/kunit/kunit_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
CONFIG_IS_NOT_SET_PATTERN = r'^# CONFIG_(\w+) is not set$'
1414
CONFIG_PATTERN = r'^CONFIG_(\w+)=(\S+|".*")$'
1515

16-
KconfigEntryBase = collections.namedtuple('KconfigEntry', ['name', 'value'])
16+
KconfigEntryBase = collections.namedtuple('KconfigEntryBase', ['name', 'value'])
1717

1818
class KconfigEntry(KconfigEntryBase):
1919

0 commit comments

Comments
 (0)