On Thu, Apr 07, 2016 at 07:05:55PM +0800, Eryu Guan wrote: > Currently xfs/259 checks $TEST_DIR for CRC support status to determine > if 512 block size should be tested. But this doesn't always work. For > example, when TEST_DEV is mkfs'ed with "-m crc=0" mkfs option, using > mkfs.xfs binary with CRC being the default. > > What should be really checked is whether mkfs.xfs creates CRC enabled > XFS by default. So introduce a new flag XFS_MKFS_CRC_DEFAULT for this > purpose, and do the check based on it in xfs/259. > > Signed-off-by: Eryu Guan <eguan@xxxxxxxxxx> > --- > > This is actually the second attempt to fix this issue, because Christoph was > not satisfied with the first attempt, and me either (after thinking about it > more :-)). Hope it works this time. > > common/config | 8 ++++++++ > tests/xfs/259 | 4 +--- > 2 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/common/config b/common/config > index cacd815..13bd307 100644 > --- a/common/config > +++ b/common/config > @@ -270,8 +270,16 @@ $MKFS_XFS_PROG -N -d file,name=/tmp/crc_check.img,size=32m -m crc=0 \ > if [ $? -ne 0 ]; then > XFS_MKFS_HAS_NO_META_SUPPORT=true > fi > +# check if v5 xfs is default > +XFS_MKFS_CRC_DEFAULT=0 > +$MKFS_XFS_PROG -N -d file,name=/tmp/crc_check.img,size=32m 2>&1 | grep -q crc=1 > +if [ $? -eq 0 ]; then > + XFS_MKFS_CRC_DEFAULT=1 > +fi > rm -f /tmp/crc_check.img That tests the mkfs configuration that is applied to the scratch device.... > diff --git a/tests/xfs/259 b/tests/xfs/259 > index 16c1935..3150ff3 100755 > --- a/tests/xfs/259 > +++ b/tests/xfs/259 > @@ -51,9 +51,7 @@ testfile=$TEST_DIR/259.image > # Test various sizes slightly less than 4 TB. Need to handle different > # minimum block sizes for CRC enabled filesystems, but use a small log so we > # don't write lots of zeros unnecessarily. > -xfs_info $TEST_DIR | _filter_mkfs 2> $tmp.mkfs > /dev/null > -. $tmp.mkfs This tests the configuration of the test device, which is not controlled by the test harness, so can be different to the configuration being used for the scratch device. > -if [ $_fs_has_crcs -eq 1 ]; then > +if [ $XFS_MKFS_CRC_DEFAULT -eq 1 ]; then IOWs, this is not an not equivalent test. Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
