path: root/tools/testing/selftests/livepatch
diff options
authorJoe Lawrence <joe.lawrence@redhat.com>2020-06-18 14:10:39 -0400
committerPetr Mladek <pmladek@suse.com>2020-06-19 10:47:04 +0200
commitc401088f0f1887761b8472352fd4f23595a74149 (patch)
treeb18fe9054f7b5a75bb7bbd36fcd2c567acb96a71 /tools/testing/selftests/livepatch
parentselftests/livepatch: Don't clear dmesg when running tests (diff)
selftests/livepatch: refine dmesg 'taints' in dmesg comparison
The livepatch selftests currently grep on "taints" to filter out "tainting kernel with TAINT_LIVEPATCH" messages which may be logged when loading livepatch modules. Further filter the log to drop "loading out-of-tree module taints kernel" in the rare case the klp_test modules have been built out-of-tree. Look for the longer "taints kernel" or "tainting kernel" strings to avoid inadvertent partial matching. Signed-off-by: Joe Lawrence <joe.lawrence@redhat.com> Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> Reviewed-by: Yannick Cote <ycote@redhat.com> Reviewed-by: Petr Mladek <pmladek@suse.com> Acked-by: Miroslav Benes <mbenes@suse.cz> Signed-off-by: Petr Mladek <pmladek@suse.com> Link: https://lore.kernel.org/r/20200618181040.21132-3-joe.lawrence@redhat.com
Diffstat (limited to 'tools/testing/selftests/livepatch')
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh
index bf73ec4f4a71..5e5a79179fc1 100644
--- a/tools/testing/selftests/livepatch/functions.sh
+++ b/tools/testing/selftests/livepatch/functions.sh
@@ -277,7 +277,8 @@ function check_result {
# post-comparison sed filter.
result=$(dmesg | diff --changed-group-format='%>' --unchanged-group-format='' "$SAVED_DMESG" - | \
- grep -v 'tainting' | grep -e 'livepatch:' -e 'test_klp' | \
+ grep -e 'livepatch:' -e 'test_klp' | \
+ grep -v '\(tainting\|taints\) kernel' | \
sed 's/^\[[ 0-9.]*\] //')
if [[ "$expect" == "$result" ]] ; then