From: Kees Cook <keescook@chromium.org>
To: Matthieu Baerts <matthieu.baerts@tessares.net>
Cc: Shuah Khan <shuah@kernel.org>,
linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] selftests: settings: tests can be in subsubdirs
Date: Thu, 21 Nov 2019 10:52:08 -0800 [thread overview]
Message-ID: <201911211018.D6CD68AC5@keescook> (raw)
In-Reply-To: <c9ce5016-9e83-67c0-ae22-2d3c46427b25@tessares.net>
On Thu, Nov 21, 2019 at 05:32:42PM +0100, Matthieu Baerts wrote:
> Hi Shuah,
>
> First, thank you for maintaining the Kernel Selftest framework!
>
> On 22/10/2019 19:12, Matthieu Baerts wrote:
> > Commit 852c8cbf34d3 (selftests/kselftest/runner.sh: Add 45 second
> > timeout per test) adds support for a new per-test-directory "settings"
> > file. But this only works for tests not in a sub-subdirectories, e.g.
> >
> > - tools/testing/selftests/rtc (rtc) is OK,
> > - tools/testing/selftests/net/mptcp (net/mptcp) is not.
> >
> > We have to increase the timeout for net/mptcp tests which are not
> > upstreamed yet but this fix is valid for other tests if they need to add
> > a "settings" file, see the full list with:
> >
> > tools/testing/selftests/*/*/**/Makefile
> >
> > Note that this patch changes the text header message printed at the end
> > of the execution but this text is modified only for the tests that are
> > in sub-subdirectories, e.g.
> >
> > ok 1 selftests: net/mptcp: mptcp_connect.sh
> >
> > Before we had:
> >
> > ok 1 selftests: mptcp: mptcp_connect.sh
> >
> > But showing the full target name is probably better, just in case a
> > subsubdir has the same name as another one in another subdirectory.
> >
> > Fixes: 852c8cbf34d3 (selftests/kselftest/runner.sh: Add 45 second timeout per test)
> > Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
> Sorry to bother you again with this but by chance, did you have a look at
> the patch below? :)
>
> It doesn't only fix an issue with MPTCP, not in the kernel yet. But it also
> fixes the issue of taking the right "settings" file (if available) for any
> other tests in a sub-directory, e.g.:
>
> drivers/dma-buf
> filesystems/binderfs
> net/forwarding
> networking/timestamping
>
> But I guess all tests in powerpc/* dirs and others.
Thanks for the ping! I missed this patch when you originally sent it.
Yes, this make sense to me:
Reviewed-by: Kees Cook <keescook@chromium.org>
As an improvement on this, I wonder if we need to walk all directories
between $BASEDIR and $DIR? Actually, let me write this and send it...
-Kees
>
> Cheers,
> Matt
>
> > ---
> > tools/testing/selftests/kselftest/runner.sh | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/testing/selftests/kselftest/runner.sh b/tools/testing/selftests/kselftest/runner.sh
> > index 84de7bc74f2c..0d7a89901ef7 100644
> > --- a/tools/testing/selftests/kselftest/runner.sh
> > +++ b/tools/testing/selftests/kselftest/runner.sh
> > @@ -90,7 +90,7 @@ run_one()
> > run_many()
> > {
> > echo "TAP version 13"
> > - DIR=$(basename "$PWD")
> > + DIR="${PWD#${BASE_DIR}/}"
> > test_num=0
> > total=$(echo "$@" | wc -w)
> > echo "1..$total"
> >
>
> --
> Matthieu Baerts | R&D Engineer
> matthieu.baerts@tessares.net
> Tessares SA | Hybrid Access Solutions
> www.tessares.net
> 1 Avenue Jean Monnet, 1348 Louvain-la-Neuve, Belgium
--
Kees Cook
next prev parent reply other threads:[~2019-11-21 18:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-22 17:12 [PATCH] selftests: settings: tests can be in subsubdirs Matthieu Baerts
2019-11-21 16:32 ` Matthieu Baerts
2019-11-21 18:52 ` Kees Cook [this message]
2020-01-27 16:05 ` Matthieu Baerts
2020-01-27 17:16 ` shuah
2020-01-27 20:34 ` Matthieu Baerts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201911211018.D6CD68AC5@keescook \
--to=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=matthieu.baerts@tessares.net \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).