Skip to content

Commit 2f3f651

Browse files
joe-lawrencepmladek
authored andcommitted
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
1 parent 3fd9bd8 commit 2f3f651

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

tools/testing/selftests/livepatch/functions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ function check_result {
277277
# help differentiate repeated testing runs. Remove them with a
278278
# post-comparison sed filter.
279279

280-
result=$(dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$SAVED_DMESG" - | \
280+
result=$(dmesg | comm -13 "$SAVED_DMESG" - | \
281281
grep -e 'livepatch:' -e 'test_klp' | \
282282
grep -v '\(tainting\|taints\) kernel' | \
283283
sed 's/^\[[ 0-9.]*\] //')

0 commit comments

Comments
 (0)