lkml.org 
[lkml]   [2020]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 118/606] ftrace/selftest: make unresolved cases cause failure if --fail-unresolved set
    Date
    From: Alan Maguire <alan.maguire@oracle.com>

    [ Upstream commit b730d668138cb3dd9ce78f8003986d1adae5523a ]

    Currently, ftracetest will return 1 (failure) if any unresolved cases
    are encountered. The unresolved status results from modules and
    programs not being available, and as such does not indicate any
    issues with ftrace itself. As such, change the behaviour of
    ftracetest in line with unsupported cases; if unsupported cases
    happen, ftracetest still returns 0 unless --fail-unsupported. Here
    --fail-unresolved is added and the default is to return 0 if
    unresolved results occur.

    Signed-off-by: Alan Maguire <alan.maguire@oracle.com>
    Acked-by: Masami Hiramatsu <mhiramat@kernel.org>
    Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/ftrace/ftracetest | 8 +++++++-
    1 file changed, 7 insertions(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest
    index 144308a757b7..19e9236dec5e 100755
    --- a/tools/testing/selftests/ftrace/ftracetest
    +++ b/tools/testing/selftests/ftrace/ftracetest
    @@ -17,6 +17,7 @@ echo " -v|--verbose Increase verbosity of test messages"
    echo " -vv Alias of -v -v (Show all results in stdout)"
    echo " -vvv Alias of -v -v -v (Show all commands immediately)"
    echo " --fail-unsupported Treat UNSUPPORTED as a failure"
    +echo " --fail-unresolved Treat UNRESOLVED as a failure"
    echo " -d|--debug Debug mode (trace all shell commands)"
    echo " -l|--logdir <dir> Save logs on the <dir>"
    echo " If <dir> is -, all logs output in console only"
    @@ -112,6 +113,10 @@ parse_opts() { # opts
    UNSUPPORTED_RESULT=1
    shift 1
    ;;
    + --fail-unresolved)
    + UNRESOLVED_RESULT=1
    + shift 1
    + ;;
    --logdir|-l)
    LOG_DIR=$2
    shift 2
    @@ -176,6 +181,7 @@ KEEP_LOG=0
    DEBUG=0
    VERBOSE=0
    UNSUPPORTED_RESULT=0
    +UNRESOLVED_RESULT=0
    STOP_FAILURE=0
    # Parse command-line options
    parse_opts $*
    @@ -280,7 +286,7 @@ eval_result() { # sigval
    $UNRESOLVED)
    prlog " [${color_blue}UNRESOLVED${color_reset}]"
    UNRESOLVED_CASES="$UNRESOLVED_CASES $CASENO"
    - return 1 # this is a kind of bug.. something happened.
    + return $UNRESOLVED_RESULT # depends on use case
    ;;
    $UNTESTED)
    prlog " [${color_blue}UNTESTED${color_reset}]"
    --
    2.25.1
    \
     
     \ /
      Last update: 2020-06-09 02:35    [W:4.780 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site