aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJoe Lawrence <joe.lawrence@redhat.com>2020-07-10 14:37:45 -0400
committerPetr Mladek <pmladek@suse.com>2020-07-14 09:32:27 +0200
commit2f3f651f3756ef9beff704ae4d8d85e797df5b3b (patch)
treef50412042e9aa615ccf790634d23428ac23b49d9 /tools
parentselftests/livepatch: add test delimiter to dmesg (diff)
downloadlinux-dev-2f3f651f3756ef9beff704ae4d8d85e797df5b3b.tar.xz
linux-dev-2f3f651f3756ef9beff704ae4d8d85e797df5b3b.zip
selftests/livepatch: Use "comm" instead of "diff" for dmesg
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
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/livepatch/functions.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh
index 36648ca367c2..408529d94ddb 100644
--- a/tools/testing/selftests/livepatch/functions.sh
+++ b/tools/testing/selftests/livepatch/functions.sh
@@ -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.]*\] //')