From: Darrick J. Wong <djwong@kernel.org>
Date: Wed, 27 Mar 2024 02:43:23 +0000 (-0700)
Subject: xfs/270: fix rocompat regex
X-Git-Tag: xfs-zoned-2024-08-22~204
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1512b876e6026e2064dbabe738f7ea0377a7324b;p=users%2Fhch%2Fxfstests-dev.git

xfs/270: fix rocompat regex

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>
---

diff --git a/tests/xfs/270 b/tests/xfs/270
index 4e4f767dc..16e508035 100755
--- a/tests/xfs/270
+++ b/tests/xfs/270
@@ -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