[PATCH 3/3] xfs/158: _notrun when the file system can't be created

[Christoph Hellwig <hch@lst.de>]

I get an "inode btree counters not supported without finobt support"
with some zoned setups with the latests xfsprogs.  Just _notrun the
test if we can't create the original file system feature combination
that we're trying to upgrade from.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/xfs/158 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/xfs/158 b/tests/xfs/158
index 89bf8c851659..02ab39ffda0b 100755
--- a/tests/xfs/158
+++ b/tests/xfs/158
@@ -22,12 +22,14 @@ _scratch_mkfs -m crc=1,inobtcount=1,finobt=0 &> $seqres.full && \
 	echo "Should not be able to format with inobtcount but not finobt."
 
 # Make sure we can't upgrade a filesystem to inobtcount without finobt.
-_scratch_mkfs -m crc=1,inobtcount=0,finobt=0 >> $seqres.full
+try_scratch_mkfs -m crc=1,inobtcount=0,finobt=0 || \
+	_notrun "invalid feature combination" >> $seqres.full
 _scratch_xfs_admin -O inobtcount=1 2>> $seqres.full
 _check_scratch_xfs_features INOBTCNT
 
 # Format V5 filesystem without inode btree counter support and populate it.
-_scratch_mkfs -m crc=1,inobtcount=0 >> $seqres.full
+_scratch_mkfs -m crc=1,inobtcount=0 || \
+	_notrun "invalid feature combination" >> $seqres.full
 _scratch_mount
 
 mkdir $SCRATCH_MNT/stress
-- 
2.47.3