lkml.org 
[lkml]   [2020]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.5 115/542] selftests: settings: tests can be in subsubdirs
    Date
    From: Matthieu Baerts <matthieu.baerts@tessares.net>

    [ Upstream commit ac87813d4372f4c005264acbe3b7f00c1dee37c4 ]

    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>
    Reviewed-by: Kees Cook <keescook@chromium.org>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 a8d20cbb711cf..e84d901f85672 100644
    --- a/tools/testing/selftests/kselftest/runner.sh
    +++ b/tools/testing/selftests/kselftest/runner.sh
    @@ -91,7 +91,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"
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-02-14 16:51    [W:2.892 / U:0.352 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site