From 876c233f06be5c1cd973ad2fb7d803a36c8ad298 Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Mon, 13 Apr 2026 15:10:34 -0700 Subject: [PATCH 1/2] Ignore another xfs lockdep class This already caught xfs_nondir_ilock_class, but recent CI runs have been hitting xfs_dir_ilock_class, too. Signed-off-by: Auke Kok --- tests/funcs/filter.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/funcs/filter.sh b/tests/funcs/filter.sh index 795a01de..1016b8ef 100644 --- a/tests/funcs/filter.sh +++ b/tests/funcs/filter.sh @@ -87,7 +87,7 @@ awk ' ( in_block == 2 ) { buf = buf $0 "\n" if ($0 ~ /<\/TASK>/) { - if (buf ~ /xfs_nondir_ilock_class/ && buf ~ /fs_reclaim/) { + if (buf ~ /xfs_(nondir_|dir_)?ilock_class/ && buf ~ /fs_reclaim/) { # known xfs lockdep false positive, discard } else { printf "%s", buf From 9e3b01b3b49660a3929740dde0840319c75f48eb Mon Sep 17 00:00:00 2001 From: Auke Kok Date: Mon, 13 Apr 2026 15:11:15 -0700 Subject: [PATCH 2/2] Filter newlines out dmesg.new Without overly broad filtering empty lines from dmesg, filter them so dmesg.new doesn't trigger a test failure. I don't want to overly process dmesg, so do this as late as possible. The xfs lockdep patterns can forget a leading/trailing empty line, causing a failure despite the explicit removal of the lockdep false positive. Signed-off-by: Auke Kok --- tests/run-tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run-tests.sh b/tests/run-tests.sh index f6c506ec..56598cbc 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -694,8 +694,8 @@ for t in $tests; do if [ "$sts" == "$T_PASS_STATUS" ]; then dmesg | t_filter_dmesg > "$T_TMPDIR/dmesg.after" diff --old-line-format="" --unchanged-line-format="" \ - "$T_TMPDIR/dmesg.before" "$T_TMPDIR/dmesg.after" > \ - "$T_TMPDIR/dmesg.new" + "$T_TMPDIR/dmesg.before" "$T_TMPDIR/dmesg.after" | \ + grep -v '^$' > "$T_TMPDIR/dmesg.new" if [ -s "$T_TMPDIR/dmesg.new" ]; then message="unexpected messages in dmesg"