Commit 7acac4b3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-kunit-fixes-5.12-rc5.1' of... 

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
parents 84196390 7fd53f41

tools/testing/kunit/configs/broken_on_uml.config

+2 −0
Original line number Diff line number Diff line
@@ -40,3 +40,5 @@ 
# CONFIG_RESET_BRCMSTB_RESCAL is not set

# CONFIG_RESET_INTEL_GW is not set

# CONFIG_ADI_AXI_ADC is not set

# CONFIG_DEBUG_PAGEALLOC is not set

# CONFIG_PAGE_POISONING is not set

tools/testing/kunit/kunit_config.py

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ from typing import List, Set 
CONFIG_IS_NOT_SET_PATTERN = r'^# CONFIG_(\w+) is not set$'

CONFIG_PATTERN = r'^CONFIG_(\w+)=(\S+|".*")$'



KconfigEntryBase = collections.namedtuple('KconfigEntry', ['name', 'value'])

KconfigEntryBase = collections.namedtuple('KconfigEntryBase', ['name', 'value'])



class KconfigEntry(KconfigEntryBase):