hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

kunit: tool: fix --alltests flag 

Alltests flag evidently stopped working when run from outside of the
root of the source tree, so fix that. Also add an additional broken
config to the broken_on_uml config.

Signed-off-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
Brendan Higgins 2020-09-23 14:19:38 -07:00 committed by Shuah Khan
parent 21a6d1780d
commit 67e2fae3b7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/testing/kunit/configs/broken_on_uml.config
View File

@ -39,3 +39,4 @@
# CONFIG_QCOM_CPR is not set # CONFIG_QCOM_CPR is not set
# CONFIG_RESET_BRCMSTB_RESCAL is not set # CONFIG_RESET_BRCMSTB_RESCAL is not set
# CONFIG_RESET_INTEL_GW is not set # CONFIG_RESET_INTEL_GW is not set
# CONFIG_ADI_AXI_ADC is not set

15
tools/testing/kunit/kunit_kernel.py
View File

@ -53,18 +53,23 @@ class LinuxSourceTreeOperations(object):
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise ConfigError(e.output) raise ConfigError(e.output)
def make_allyesconfig(self): def make_allyesconfig(self, build_dir, make_options):
kunit_parser.print_with_timestamp( kunit_parser.print_with_timestamp(
'Enabling all CONFIGs for UML...') 'Enabling all CONFIGs for UML...')
command = ['make', 'ARCH=um', 'allyesconfig']
if make_options:
command.extend(make_options)
if build_dir:
command += ['O=' + build_dir]
process = subprocess.Popen( process = subprocess.Popen(
['make', 'ARCH=um', 'allyesconfig'], command,
stdout=subprocess.DEVNULL, stdout=subprocess.DEVNULL,
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
process.wait() process.wait()
kunit_parser.print_with_timestamp( kunit_parser.print_with_timestamp(
'Disabling broken configs to run KUnit tests...') 'Disabling broken configs to run KUnit tests...')
with ExitStack() as es: with ExitStack() as es:
config = open(KCONFIG_PATH, 'a') config = open(get_kconfig_path(build_dir), 'a')
disable = open(BROKEN_ALLCONFIG_PATH, 'r').read() disable = open(BROKEN_ALLCONFIG_PATH, 'r').read()
config.write(disable) config.write(disable)
kunit_parser.print_with_timestamp( kunit_parser.print_with_timestamp(
@ -161,9 +166,9 @@ class LinuxSourceTree(object):
return self.build_config(build_dir, make_options) return self.build_config(build_dir, make_options)
def build_um_kernel(self, alltests, jobs, build_dir, make_options): def build_um_kernel(self, alltests, jobs, build_dir, make_options):
if alltests:
self._ops.make_allyesconfig()
try: try:
if alltests:
self._ops.make_allyesconfig(build_dir, make_options)
self._ops.make_olddefconfig(build_dir, make_options) self._ops.make_olddefconfig(build_dir, make_options)
self._ops.make(jobs, build_dir, make_options) self._ops.make(jobs, build_dir, make_options)
except (ConfigError, BuildError) as e: except (ConfigError, BuildError) as e: