[v4,2/2] Makefile: add kselftest-merge
diff mbox

Message ID 1452238054-15482-3-git-send-email-bamvor.zhangjian@linaro.org
State New
Headers show

Commit Message

Bamvor Zhang Jian Jan. 8, 2016, 7:27 a.m. UTC
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>
---
 Makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

Comments

Shuah Khan Feb. 23, 2016, 2:34 p.m. UTC | #1
On 01/08/2016 12:27 AM, Bamvor Jian Zhang wrote:
> 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>

Could you please ACK this patch if you are okay
with the changes? I will take this through ksleftest
tree.

thanks,
-- Shuah

> ---
>  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
>
Shuah Khan Feb. 23, 2016, 6:31 p.m. UTC | #2
On 02/23/2016 07:34 AM, Shuah Khan wrote:
> On 01/08/2016 12:27 AM, Bamvor Jian Zhang wrote:
>> 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>
> 
> Could you please ACK this patch if you are okay
> with the changes? I will take this through ksleftest
> tree.
> 
> thanks,
> -- Shuah

Applied this patch to linux-kselftest next with

[PATCH v4 1/2] selftests: create test-specific kconfig fragments

to get some testing in for now.

thanks,
-- Shuah

Patch
diff mbox

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