Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kbuild: teach kselftest-merge to find nested config files

Current implementation of kselftest-merge only finds config files that
are one level deep using `$(srctree)/tools/testing/selftests/*/config`.

Often, config files are added in nested directories, and do not get
picked up by kselftest-merge.

Use `find` to catch all config files under
`$(srctree)/tools/testing/selftests` instead.

Signed-off-by: Dan Rue <dan.rue@linaro.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

authored by

Dan Rue and committed by
Masahiro Yamada
6d3db46c f2c7c76c

+2 -3
+2 -3
Makefile
··· 1228 1228 PHONY += kselftest-merge 1229 1229 kselftest-merge: 1230 1230 $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) 1231 - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ 1232 - -m $(objtree)/.config \ 1233 - $(srctree)/tools/testing/selftests/*/config 1231 + $(Q)find $(srctree)/tools/testing/selftests -name config | \ 1232 + xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config 1234 1233 +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig 1235 1234 1236 1235 # ---------------------------------------------------------------------------