lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 213/757] selftests/livepatch: Do not check order when using "comm" for dmesg checking
    Date
    From: Miroslav Benes <mbenes@suse.cz>

    [ Upstream commit 884ee754f5aedbe54406a4d308a6cc57335747ce ]

    check_result() uses "comm" to check expected results of selftests output
    in dmesg. Everything works fine if timestamps in dmesg are unique. If
    not, like in this example

    [ 86.844422] test_klp_callbacks_demo: pre_unpatch_callback: test_klp_callbacks_mod -> [MODULE_STATE_LIVE] Normal state
    [ 86.844422] livepatch: 'test_klp_callbacks_demo': starting unpatching transition

    , "comm" fails with "comm: file 2 is not in sorted order". Suppress the
    order checking with --nocheck-order option.

    Fixes: 2f3f651f3756 ("selftests/livepatch: Use "comm" instead of "diff" for dmesg")
    Signed-off-by: Miroslav Benes <mbenes@suse.cz>
    Acked-by: Joe Lawrence <joe.lawrence@redhat.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/livepatch/functions.sh | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh
    index 1aba83c87ad32..846c7ed71556f 100644
    --- a/tools/testing/selftests/livepatch/functions.sh
    +++ b/tools/testing/selftests/livepatch/functions.sh
    @@ -278,7 +278,7 @@ function check_result {
    # help differentiate repeated testing runs. Remove them with a
    # post-comparison sed filter.

    - result=$(dmesg | comm -13 "$SAVED_DMESG" - | \
    + result=$(dmesg | comm --nocheck-order -13 "$SAVED_DMESG" - | \
    grep -e 'livepatch:' -e 'test_klp' | \
    grep -v '\(tainting\|taints\) kernel' | \
    sed 's/^\[[ 0-9.]*\] //')
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:11    [W:4.237 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site