]> git.baikalelectronics.ru Git - kernel.git/commit
selftests: settings: tests can be in subsubdirs
authorMatthieu Baerts <matthieu.baerts@tessares.net>
Tue, 22 Oct 2019 17:12:20 +0000 (19:12 +0200)
committerShuah Khan <skhan@linuxfoundation.org>
Mon, 27 Jan 2020 17:49:52 +0000 (10:49 -0700)
commit5979b17fb5d91ecaefe6d03df126c2d4f3e702f0
tree2faf4403969158ef1cf85697d3eb516b18edc013
parentb4b3ead2b9b6f2600825ff1c1a4638c50f53a5f3
selftests: settings: tests can be in subsubdirs

Commit ab69fa1f21e9 ("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: ab69fa1f21e9 (selftests/kselftest/runner.sh: Add 45 second timeout per test)
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
tools/testing/selftests/kselftest/runner.sh