[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[PATCH AUTOSEL 5.4 099/459] selftests: settings: tests can be in subsubdirs
From: Matthieu Baerts <>

[ Upstream commit ac87813d4372f4c005264acbe3b7f00c1dee37c4 ]

Commit 852c8cbf34d3 ("selftests/kselftest/ 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:


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:

Before we had:

ok 1 selftests: mptcp:

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/ Add 45 second timeout per test)
Signed-off-by: Matthieu Baerts <>
Reviewed-by: Kees Cook <>
Signed-off-by: Shuah Khan <>
Signed-off-by: Sasha Levin <>
tools/testing/selftests/kselftest/ | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kselftest/ b/tools/testing/selftests/kselftest/
index a8d20cbb711cf..e84d901f85672 100644
--- a/tools/testing/selftests/kselftest/
+++ b/tools/testing/selftests/kselftest/
@@ -91,7 +91,7 @@ run_one()
echo "TAP version 13"
- DIR=$(basename "$PWD")
+ DIR="${PWD#${BASE_DIR}/}"
total=$(echo "$@" | wc -w)
echo "1..$total"
 \ /
  Last update: 2020-02-14 17:05    [W:1.234 / U:0.932 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site