From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754289AbcAHH2d (ORCPT ); Fri, 8 Jan 2016 02:28:33 -0500 Received: from mail-pa0-f49.google.com ([209.85.220.49]:34937 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754150AbcAHH2K (ORCPT ); Fri, 8 Jan 2016 02:28:10 -0500 From: Bamvor Jian Zhang To: linux-api@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, shuahkh@osg.samsung.com, yann.morin.1998@free.fr, khilman@linaro.org, tyler.baker@linaro.org, broonie@kernel.org, mpe@ellerman.id.au, dvhart@infradead.org, mmarek@suse.com, Bamvor Jian Zhang Subject: [PATCH v4 2/2] Makefile: add kselftest-merge Date: Fri, 8 Jan 2016 15:27:34 +0800 Message-Id: <1452238054-15482-3-git-send-email-bamvor.zhangjian@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1452238054-15482-1-git-send-email-bamvor.zhangjian@linaro.org> References: <1452238054-15482-1-git-send-email-bamvor.zhangjian@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- Makefile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile index cd40956..bfb9faa 100644 --- a/Makefile +++ b/Makefile @@ -1104,6 +1104,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 @@ -1312,6 +1320,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 -- 2.1.4