Skip to content

Commit 2d5a7e0

Browse files
committed
contest: hw: actually include target's config files
Somehow the slop generator missed the part of including target's configs in the build. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent b2b1cf9 commit 2d5a7e0

1 file changed

Lines changed: 10 additions & 4 deletions

File tree

contest/hw/lib/deployer.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,16 @@ def build_kernel(config, tree_path):
6262
_run(['make', '-C', tree_path, 'defconfig'])
6363

6464
# Apply extra kconfig fragments (space-separated list)
65-
extra_kconfig = config.get('build', 'extra_kconfig', fallback=None)
66-
if extra_kconfig:
67-
configs = extra_kconfig.split()
68-
_run(['scripts/kconfig/merge_config.sh', '-m', '.config'] + configs,
65+
extra_configs = []
66+
extra_configs += config.get('build', 'extra_kconfig', fallback="").split()
67+
targets = config.get('ksft', 'target', fallback='net').split()
68+
for target in targets:
69+
one_config = f"tools/testing/selftests/{target}/config"
70+
if os.path.exists(one_config):
71+
extra_configs.append(one_config)
72+
73+
if extra_configs:
74+
_run(['scripts/kconfig/merge_config.sh', '-m', '.config'] + extra_configs,
6975
cwd=tree_path)
7076
_run(['make', '-C', tree_path, 'olddefconfig'])
7177

0 commit comments

Comments
 (0)