path: root/Makefile
diff options
authorLinus Torvalds <>2016-03-17 19:37:08 -0700
committerLinus Torvalds <>2016-03-17 19:37:08 -0700
commit3d15cfdb1b77536c205d8e49c0312219ddf162ec (patch)
tree8615e83fc3765920be21e5bc2e157862b42d8d29 /Makefile
parent5cd0911a9e0e408f28079a5e36a981217bf47520 (diff)
parent6accd8e9bf22749f621fb7fb57995fa65f4cd873 (diff)
Merge tag 'linux-kselftest-4.6-rc1' of git://
Pull Kselftest updates from Shuah Khan: "This update for Kselftest adds: - A new feature to create test-specific kconfig fragments. This feature helps configure Kselftests to test specific Kernel Configuration options as opposed to defconfig. - A new test for Media Controller API - A few fixes" * tag 'linux-kselftest-4.6-rc1' of git:// selftests: media_dcevice_test fix usage information selftests: media_dcevice_test fix to handle ioctl failure case selftests: add missing .gitignore file or entry Makefile: add kselftest-merge selftests: create test-specific kconfig fragments selftests: breakpoint: add step_after_suspend_test selftests: add a new test for Media Controller API
Diffstat (limited to 'Makefile')
1 files changed, 10 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 7b3ecdcdc6c1..6798c6b4775d 100644
--- a/Makefile
+++ b/Makefile
@@ -1087,6 +1087,14 @@ kselftest:
$(Q)$(MAKE) -C tools/testing/selftests clean
+PHONY += kselftest-merge
+ $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!))
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/ \
+ -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