Skip to contentSkip to conversation

xfs/030: skip this test if metadir gets enabled anyway

PATCH In review Darrick J. Wong 2 participants 2 messages Aug 26 – Aug 27

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs/030: skip this test if metadir gets enabled anyway

From: Darrick J. Wong <[email protected]>

This test requires metadir not to be enabled, but under certain circumstances (aka _scratch_mkfs_xfs trying to be helpful and dropping MKFS_OPTIONS) it can get enabled anyway if mkfs.xfs defaults to enabling metadir. Check the fs feature set after formatting and skip the test if metadir gets enabled.

---
 tests/xfs/030 |    1 +
 1 file changed, 1 insertion(+)
tests/xfs/030 +1 -0
index 22fbdb2fdbc999..d0b8f413bb9afd 100755
@@ -72,6 +72,7 @@ else
 		_notrun "PQuota are enabled, test needs controlled sb recovery"
 	_scratch_unmount
 fi
+_xfs_has_feature "$SCRATCH_DEV" metadir && _notrun "metadir enabled anyway"
 clear=""
 eval `_scratch_xfs_db -r -c "sb 1" -c stack | perl -ne '
 	if (/byte offset (\d+), length (\d+)/) {
Reviewed-by on v1 1/1
#1 lore raw
Quoted 18 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

This test requires metadir not to be enabled, but under certain circumstances (aka _scratch_mkfs_xfs trying to be helpful and dropping MKFS_OPTIONS) it can get enabled anyway if mkfs.xfs defaults to enabling metadir. Check the fs feature set after formatting and skip the test if metadir gets enabled.

---
 tests/xfs/030 |    1 +
 1 file changed, 1 insertion(+)
tests/xfs/030 +0 -0
index 22fbdb2fdbc999..d0b8f413bb9afd 100755

tests/xfs/030 else · line 75

Quoted 4 lines
tests/xfs/030 +1 -0
@@ -72,6 +72,7 @@ else
 		_notrun "PQuota are enabled, test needs controlled sb recovery"
 	_scratch_unmount
 fi
+_xfs_has_feature "$SCRATCH_DEV" metadir && _notrun "metadir enabled anyway"
Quoted 3 lines
tests/xfs/030 +0 -0
 clear=""
 eval `_scratch_xfs_db -r -c "sb 1" -c stack | perl -ne '
 	if (/byte offset (\d+), length (\d+)/) {