]> www.infradead.org Git - users/hch/xfstests-dev.git/commitdiff
xfs/270: fix rocompat regex
authorDarrick J. Wong <djwong@kernel.org>
Wed, 27 Mar 2024 02:43:23 +0000 (19:43 -0700)
committerZorro Lang <zlang@kernel.org>
Sat, 30 Mar 2024 07:48:12 +0000 (15:48 +0800)
This test fails with the fsverity patchset because the rocompat feature
bit for verity is 0x10.  The regular expression used to check if the
output is hexadecimal requires a single-digit answer, which is no longer
the case.

Fixes: 5bb78c56ef ("xfs/270: Fix ro mount failure when nrext64 option is enabled")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
tests/xfs/270

index 4e4f767dc15cd3b730449c5e12843fe293bc7712..16e508035a9c7d04b247315a9cf903ed4722ac07 100755 (executable)
@@ -30,8 +30,9 @@ _require_scratch_shutdown
 # change this case.
 set_bad_rocompat() {
        ro_compat=$(_scratch_xfs_get_metadata_field "features_ro_compat" "sb 0")
-       echo $ro_compat | grep -q -E '^0x[[:xdigit:]]$'
+       echo $ro_compat | grep -q -E '^0x[[:xdigit:]]+$'
        if [[ $? != 0  ]]; then
+               echo ":$ro_compat:"
                echo "features_ro_compat has an invalid value."
                return 1
        fi