On Tue, May 21, 2019 at 12:19 AM Dan Rue <dan....@linaro.org> wrote: > > 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....@linaro.org> > --- > Makefile | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/Makefile b/Makefile > index a45f84a7e811..e99e7f9484af 100644 > --- a/Makefile > +++ b/Makefile > @@ -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 > > # --------------------------------------------------------------------------- > -- > 2.21.0 >
Applied to linux-kbuild/fixes. Thanks. -- Best Regards Masahiro Yamada
