1) When crc is not supported or disabled, this case could not indicate any expected error. Running all tests without crc makes no sense. 2) When finobt is disabled, xfs_db fails to get current address of free_root, as below: xfs_db -c "agi" -c "addr free_root" -c "daddr" /dev/sda11 Metadata CRC error detected at xfs_inobt block 0x0/0x1000 ... Running related tests without finobt makes no sense. We add check to fix it. Signed-off-by: Xiao Yang <yangx.jy@xxxxxxxxxxxxxx> --- tests/xfs/424 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/xfs/424 b/tests/xfs/424 index 0a1eef9..165c390 100755 --- a/tests/xfs/424 +++ b/tests/xfs/424 @@ -55,9 +55,15 @@ rm -f $seqres.full _supported_os Linux _supported_fs xfs _require_scratch +_require_xfs_mkfs_crc echo "Silence is golden." +crc_finobt_enabled="crc=1,finobt=0" + +[ _scratch_mkfs_xfs_supported -m crc=1,finobt=1 >/dev/null 2>&1 ] && \ + crc_finobt_enabled="crc=1,finobt=1" + # real QA test starts here # for different sector sizes, ensure no CRC errors are falsely reported. @@ -77,7 +83,7 @@ while [ $sec_sz -le 4096 ]; do done for SECTOR_SIZE in $sector_sizes; do - $MKFS_XFS_PROG -f -s size=$SECTOR_SIZE $SCRATCH_DEV > /dev/null + $MKFS_XFS_PROG -f -m "$crc_finobt_enabled" -s size=$SECTOR_SIZE $SCRATCH_DEV > /dev/null for TYPE in agf agi agfl sb; do DADDR=`_scratch_xfs_db -c "$TYPE" -c "daddr" | filter_dbval` @@ -96,9 +102,11 @@ for SECTOR_SIZE in $sector_sizes; do DADDR=`_scratch_xfs_db -c "agi" -c "addr root" -c "daddr" | filter_dbval` _scratch_xfs_db -c "daddr $DADDR" -c "type inobt" - DADDR=`_scratch_xfs_db -c "agi" -c "addr free_root" -c "daddr" | - filter_dbval` - _scratch_xfs_db -c "daddr $DADDR" -c "type finobt" + if [[ "$crc_finobt_enabled" =~ 'finobt=1' ]]; then + DADDR=`_scratch_xfs_db -c "agi" -c "addr free_root" -c "daddr" | + filter_dbval` + _scratch_xfs_db -c "daddr $DADDR" -c "type finobt" + fi _scratch_xfs_db -c "daddr $DADDR" -c "type text" _scratch_xfs_db -c "daddr $DADDR" -c "type data" -- 1.8.3.1 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
