Re: [PATCH v3 1/2] selftests: kvm: Adding config fragments

From: Naresh Kamboju
Date: Fri Aug 09 2019 - 03:53:25 EST


On Fri, 9 Aug 2019 at 13:09, Paolo Bonzini <pbonzini@xxxxxxxxxx> wrote:
>
> On 09/08/19 09:24, Naresh Kamboju wrote:
> > selftests kvm all test cases need pre-required kernel config for the
> > tests to get pass.
> >
> > CONFIG_KVM=y
> >
> > The KVM tests are skipped without these configs:
> >
> > dev_fd = open(KVM_DEV_PATH, O_RDONLY);
> > if (dev_fd < 0)
> > exit(KSFT_SKIP);
> >
> > Signed-off-by: Naresh Kamboju <naresh.kamboju@xxxxxxxxxx>
> > Acked-by: Shuah Khan <skhan@xxxxxxxxxxxxxxxxxxx>
> > ---
> > tools/testing/selftests/kvm/config | 1 +
> > 1 file changed, 1 insertion(+)
> > create mode 100644 tools/testing/selftests/kvm/config
> >
> > diff --git a/tools/testing/selftests/kvm/config b/tools/testing/selftests/kvm/config
> > new file mode 100644
> > index 000000000000..14f90d8d6801
> > --- /dev/null
> > +++ b/tools/testing/selftests/kvm/config
> > @@ -0,0 +1 @@
> > +CONFIG_KVM=y
> >
>
> I think this is more complicated without a real benefit, so I'll merge v2.

With the recent changes to 'kselftest-merge' nested configs also get merged.
Please refer this below commit for more details.
---
commit 6d3db46c8e331908775b0135dc7d2e5920bf6d90
Author: Dan Rue <dan.rue@xxxxxxxxxx>
Date: Mon May 20 10:16:14 2019 -0500

kbuild: teach kselftest-merge to find nested config files

Current implementation of kselftest-merge only finds config files that
are one level deep using `$(srctree)/tools/testing/selftests/*/config`.

Often, config files are added in nested directories, and do not get
picked up by kselftest-merge.

Use `find` to catch all config files under
`$(srctree)/tools/testing/selftests` instead.

Signed-off-by: Dan Rue <dan.rue@xxxxxxxxxx>
Signed-off-by: Masahiro Yamada <yamada.masahiro@xxxxxxxxxxxxx>

- Naresh