selftests/livepatch: Use "comm" instead of "diff" for dmesg
authorJoe Lawrence <joe.lawrence@redhat.com>
Fri, 10 Jul 2020 18:37:45 +0000 (14:37 -0400)
committerPetr Mladek <pmladek@suse.com>
Tue, 14 Jul 2020 07:32:27 +0000 (09:32 +0200)
BusyBox diff doesn't support the GNU diff '--LTYPE-line-format' options
that were used in the selftests to filter older kernel log messages from
dmesg output.

Use "comm" which is more available in smaller boot environments.

Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com>
Reviewed-by: Yannick Cote <ycote@redhat.com>
Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20200710183745.19730-1-joe.lawrence@redhat.com
tools/testing/selftests/livepatch/functions.sh

index 36648ca..408529d 100644 (file)
@@ -277,7 +277,7 @@ function check_result {
        # help differentiate repeated testing runs.  Remove them with a
        # post-comparison sed filter.
 
-       result=$(dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$SAVED_DMESG" - | \
+       result=$(dmesg | comm -13 "$SAVED_DMESG" - | \
                 grep -e 'livepatch:' -e 'test_klp' | \
                 grep -v '\(tainting\|taints\) kernel' | \
                 sed 's/^\[[ 0-9.]*\] //')