selftests/livepatch: Do not check order when using "comm" for dmesg checking
authorMiroslav Benes <mbenes@suse.cz>
Thu, 27 Aug 2020 11:07:09 +0000 (13:07 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 27 Aug 2020 13:27:24 +0000 (15:27 +0200)
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>
tools/testing/selftests/livepatch/functions.sh

index 1aba83c87ad32bf41391eff5c5b1cc85278e73ba..846c7ed71556fb542bdf2b8c7135f645c9666b9e 100644 (file)
@@ -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.]*\] //')