Commit 6d3db46c authored May 20, 2019 by Dan Rue Committed by Masahiro Yamada Jun 05, 2019

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>

parent f2c7c76c

Makefile

+2 −3

Original line number	Diff line number	Diff line
		@@ -1228,9 +1228,8 @@ kselftest-clean:
		PHONY += kselftest-merge
		kselftest-merge:
		$(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!))
		$(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \
		-m $(objtree)/.config \
		$(srctree)/tools/testing/selftests/*/config
		$(Q)find $(srctree)/tools/testing/selftests -name config \| \
		xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config
		+$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig

		# ---------------------------------------------------------------------------

Admin message