raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

selftests/livepatch: Do not check order when using "comm" for dmesg checking

Browse Source 
[ Upstream commit 884ee754f5 ]

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: 2f3f651f37 ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Miroslav Benes
2020-08-27 13:07:09 +02:00
committed by Greg Kroah-Hartman
parent 9296dcc405
commit cd0fdb5c88
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/testing/selftests/livepatch/functions.sh
View File

@@ -278,7 +278,7 @@ function check_result {
# help differentiate repeated testing runs. Remove them with a # help differentiate repeated testing runs. Remove them with a
# post-comparison sed filter. # 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 -e 'livepatch:' -e 'test_klp' | \
grep -v '\(tainting\|taints\) kernel' | \ grep -v '\(tainting\|taints\) kernel' | \
sed 's/^\[[ 0-9.]*\] //') sed 's/^\[[ 0-9.]*\] //')