lkml.org 
[lkml]   [2018]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.17 085/336] selftests: filesystems: return Kselftest Skip code for skipped tests
    Date
    4.17-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: "Shuah Khan (Samsung OSG)" <shuah@kernel.org>

    [ Upstream commit 7357dcf2ef2811156fdf223a9a27f73528934e1f ]

    When devpts_pts test is skipped because of unmet dependencies and/or
    unsupported configuration, it exits with error which is treated as
    a fail by the Kselftest framework. This leads to false negative
    result even when the test could not be run.

    In another case, it returns pass for a skipped test reporting a false
    postive.

    Change it to return kselftest skip code when a test gets skipped to
    clearly report that the test could not be run.

    Change it to use ksft_exit_skip() when test is skipped.

    Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
    Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
    Signed-off-by: Shuah Khan (Samsung OSG) <shuah@kernel.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    tools/testing/selftests/filesystems/devpts_pts.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    --- a/tools/testing/selftests/filesystems/devpts_pts.c
    +++ b/tools/testing/selftests/filesystems/devpts_pts.c
    @@ -11,6 +11,7 @@
    #include <sys/ioctl.h>
    #include <sys/mount.h>
    #include <sys/wait.h>
    +#include "../kselftest.h"

    static bool terminal_dup2(int duplicate, int original)
    {
    @@ -125,10 +126,12 @@ static int do_tiocgptpeer(char *ptmx, ch
    if (errno == EINVAL) {
    fprintf(stderr, "TIOCGPTPEER is not supported. "
    "Skipping test.\n");
    - fret = EXIT_SUCCESS;
    + fret = KSFT_SKIP;
    + } else {
    + fprintf(stderr,
    + "Failed to perform TIOCGPTPEER ioctl\n");
    + fret = EXIT_FAILURE;
    }
    -
    - fprintf(stderr, "Failed to perform TIOCGPTPEER ioctl\n");
    goto do_cleanup;
    }

    @@ -281,7 +284,7 @@ int main(int argc, char *argv[])
    if (!isatty(STDIN_FILENO)) {
    fprintf(stderr, "Standard input file desciptor is not attached "
    "to a terminal. Skipping test\n");
    - exit(EXIT_FAILURE);
    + exit(KSFT_SKIP);
    }

    ret = unshare(CLONE_NEWNS);

    \
     
     \ /
      Last update: 2018-08-01 20:22    [W:4.084 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site