summaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-10-15 15:07:57 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2020-10-15 15:07:57 -0700
commit0cd7d9795fa82226e7516d38b474bddae8b1ff26 (patch)
tree8190d30e3cd3285dee4d90022cffe85f67b9a1b2 /tools/testing
parent4a165feba26547d2aa84a6efc494f3f2729f35b5 (diff)
parent884ee754f5aedbe54406a4d308a6cc57335747ce (diff)
downloadlinux-0cd7d9795fa82226e7516d38b474bddae8b1ff26.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching update from Jiri Kosina: "livepatching kselftest output fix from Miroslav Benes" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching: selftests/livepatch: Do not check order when using "comm" for dmesg checking
Diffstat (limited to 'tools/testing')
-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 1aba83c87ad3..846c7ed71556 100644
--- a/tools/testing/selftests/livepatch/functions.sh
+++ b/tools/testing/selftests/livepatch/functions.sh
@@ -278,7 +278,7 @@ function check_result {
# help differentiate repeated testing runs. Remove them with a
# 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 -v '\(tainting\|taints\) kernel' | \
sed 's/^\[[ 0-9.]*\] //')