kselftest-merge misses config's to merge

Commit Message

Anders Roxell Aug. 10, 2018, 8:50 a.m. UTC

Hi,

I have a question about the config files in tools/testing/selftests/ .
The kselftest-merge target in the root Makefile assumes that the
config files are placed in
tools/testing/selftests/*/config and selftests/android/ion/config and
selftests/net/forwarding/config doesn't follow that. So either we move
those files up a level or do something like below in the top Makefile.

 # ---------------------------------------------------------------------------


or do you have another way to solve this?

Cheers,
Anders

Comments

Anders Roxell Aug. 17, 2018, 5:15 p.m. UTC | #1

On Fri, 10 Aug 2018 at 10:50, Anders Roxell <[e-mail]> wrote:
>
> Hi,
>
> I have a question about the config files in tools/testing/selftests/ .
> The kselftest-merge target in the root Makefile assumes that the
> config files are placed in
> tools/testing/selftests/*/config and selftests/android/ion/config and
> selftests/net/forwarding/config doesn't follow that. So either we move
> those files up a level or do something like below in the top Makefile.
>
> diff --git a/Makefile b/Makefile
> index c88d56de7fda..06aeeca16917 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1188,12 +1188,13 @@ PHONY += kselftest-clean
>  kselftest-clean:
>   $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests clean
>
> +KSFT_CONFIGS=$(shell find $(srctree)/tools/testing/selftests/ -type f
> -name config)
>  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
> + $(KSFT_CONFIGS)
>   +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig
>
>  # ---------------------------------------------------------------------------
>
>
> or do you have another way to solve this?

I will be happy to add it to the documentation in
Documentation/dev-tools/kselftest.rst with what we say if it
is needed.

Cheers,
Anders

shuah Aug. 20, 2018, 3:01 p.m. UTC | #2

Hi Anders,

On 08/17/2018 11:15 AM, Anders Roxell wrote:
> On Fri, 10 Aug 2018 at 10:50, Anders Roxell <[e-mail]> wrote:
>>
>> Hi,
>>
>> I have a question about the config files in tools/testing/selftests/ .
>> The kselftest-merge target in the root Makefile assumes that the
>> config files are placed in
>> tools/testing/selftests/*/config and selftests/android/ion/config and
>> selftests/net/forwarding/config doesn't follow that. So either we move
>> those files up a level or do something like below in the top Makefile.

Let's move them up to where they need to be and document it as well.

Sorry for the late reply. I was out on vacation all of last week.

thanks,
-- Shuah

Patch

diff --git a/Makefile b/Makefile
index c88d56de7fda..06aeeca16917 100644
--- a/Makefile
+++ b/Makefile
@@ -1188,12 +1188,13 @@  PHONY += kselftest-clean
 kselftest-clean:
  $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests clean

+KSFT_CONFIGS=$(shell find $(srctree)/tools/testing/selftests/ -type f
-name config)
 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
+ $(KSFT_CONFIGS)
  +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig