From: Björn Töpel bjorn@rivosinc.com
Two minor changes to the kselftest-merge target:
1. Let builtin have presedence over modules when merging configs 2. Merge per-arch configs, if available
Björn
Björn Töpel (2): kbuild: Let builtin have precedence over modules for kselftest-merge kbuild: Merge per-arch config for kselftest-merge target
Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
base-commit: cbf3a2cb156a2c911d8f38d8247814b4c07f49a2
From: Björn Töpel bjorn@rivosinc.com
The kselftest-merge target walks all kselftests configs, and merges them. However, builtin does not have precedence over modules. This breaks some of the tests, e.g.:
$ grep CONFIG_NF_NAT tools/testing/selftests/{bpf,net}/config tools/testing/selftests/bpf/config:CONFIG_NF_NAT=y tools/testing/selftests/net/config:CONFIG_NF_NAT=m
Here, the net config will set NF_NAT to module, which makes it clunky to run the BPF tests.
Add '-y' to scripts/kconfig/merge_config.sh.
Signed-off-by: Björn Töpel bjorn@rivosinc.com --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile index 373649c7374e..170fb2f5e378 100644 --- a/Makefile +++ b/Makefile @@ -1368,7 +1368,7 @@ PHONY += kselftest-merge kselftest-merge: $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) $(Q)find $(srctree)/tools/testing/selftests -name config | \ - xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config + xargs $(srctree)/scripts/kconfig/merge_config.sh -y -m $(objtree)/.config $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
# ---------------------------------------------------------------------------
From: Björn Töpel bjorn@rivosinc.com
Some kselftests has a per-arch config, e.g. tools/testing/selftests/bpf/config.s390x.
Make sure these configs are picked up by the kselftest-merge target.
Signed-off-by: Björn Töpel bjorn@rivosinc.com --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile index 170fb2f5e378..0303acb311cc 100644 --- a/Makefile +++ b/Makefile @@ -1367,7 +1367,7 @@ kselftest-%: headers FORCE PHONY += kselftest-merge kselftest-merge: $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) - $(Q)find $(srctree)/tools/testing/selftests -name config | \ + $(Q)find $(srctree)/tools/testing/selftests -name config -o -name config.$(UTS_MACHINE) | \ xargs $(srctree)/scripts/kconfig/merge_config.sh -y -m $(objtree)/.config $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
linux-kselftest-mirror@lists.linaro.org
-
Björn Töpel