Commit 2f3f651f authored Jul 10, 2020 by Joe Lawrence Committed by Petr Mladek Jul 14, 2020

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

parent 3fd9bd8b

tools/testing/selftests/livepatch/functions.sh

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.]*\] //')

Admin message