]> git-server-git.apps.pok.os.sepia.ceph.com Git - xfstests-dev.git/commitdiff
generic/579: handle quoted cmp output
authorAndrey Albershteyn <aalbersh@kernel.org>
Thu, 19 Feb 2026 15:25:22 +0000 (16:25 +0100)
committerZorro Lang <zlang@kernel.org>
Fri, 20 Feb 2026 17:06:47 +0000 (01:06 +0800)
diffutils updated cmp with more consistent quoting in commit:

69ae797392bd cmp,diff,diff3,sdiff: quote more consistently

This causes generic/579 to fail from time to time due to grep not
catching these errors. Remove quote to work with new and old version of
cmp.

Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Zorro Lang <zlang@kernel.org>
tests/generic/579

index d5fab4892e9ae331f776ec1a49e69558736128f3..8a17016aadea3b6e5deb2458e293e94a24ca91c7 100755 (executable)
@@ -71,6 +71,7 @@ for ((proc = 0; proc < nproc_reader; proc++)); do
                        # match, regardless of whether verity has been enabled
                        # or not yet (or is currently being enabled).
                        cmp $orig_file $fsv_file |& _filter_scratch | \
+                               sed -e "s/'//g" | \
                                grep -v "SCRATCH_MNT/fsv$i: No such file or directory" | \
                                grep -v "EOF on SCRATCH_MNT/fsv$i"