]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
Makefile: add kselftest-merge
authorBamvor Jian Zhang <bamvor.zhangjian@linaro.org>
Fri, 8 Jan 2016 07:27:34 +0000 (15:27 +0800)
committerShuah Khan <shuahkh@osg.samsung.com>
Thu, 25 Feb 2016 16:47:52 +0000 (09:47 -0700)
Add kselftest-merge to enable the dependencies of kernel config
for all the kselftest testcases. User should call it after create
the kernel configuration(.config), eg:

$ make kselftest-merge

Signed-off-by: Bamvor Jian Zhang <bamvor.zhangjian@linaro.org>
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Makefile

index c65fe37c99e523fee40b84333d2b438e052a422a..42e3d1e111bb21529a591f7aaa3b9c95795264ec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1087,6 +1087,14 @@ kselftest:
 kselftest-clean:
        $(Q)$(MAKE) -C tools/testing/selftests 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)$(MAKE) -f $(srctree)/Makefile olddefconfig
+
 # ---------------------------------------------------------------------------
 # Modules
 
@@ -1295,6 +1303,8 @@ help:
        @echo  '                    Build, install, and boot kernel before'
        @echo  '                    running kselftest on it'
        @echo  '  kselftest-clean - Remove all generated kselftest files'
+       @echo  '  kselftest-merge - Merge all the config dependencies of kselftest to existed'
+       @echo  '                    .config.'
        @echo  ''
        @echo  'Kernel packaging:'
        @$(MAKE) $(build)=$(package-dir) help