Skip to content

Commit d009de7

Browse files
committed
Merge tag 'livepatching-for-6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
Pull livepatching fix from Petr Mladek: - Fix livepatching selftests for util-linux-2.40.x * tag 'livepatching-for-6.14-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching: selftests: livepatch: handle PRINTK_CALLER in check_result()
2 parents f5a2601 + 28aecef commit d009de7

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

tools/testing/selftests/livepatch/functions.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,8 @@ function check_result {
306306
result=$(dmesg | awk -v last_dmesg="$LAST_DMESG" 'p; $0 == last_dmesg { p=1 }' | \
307307
grep -e 'livepatch:' -e 'test_klp' | \
308308
grep -v '\(tainting\|taints\) kernel' | \
309-
sed 's/^\[[ 0-9.]*\] //')
309+
sed 's/^\[[ 0-9.]*\] //' | \
310+
sed 's/^\[[ ]*[CT][0-9]*\] //')
310311

311312
if [[ "$expect" == "$result" ]] ; then
312313
echo "ok"

0 commit comments

Comments
 (0)