On Wed, Sep 03, 2014 at 11:25:59AM +0800, Liu Bo wrote: > From: Liu Bo <liub.liubo@xxxxxxxxx> > > btrfs/012 is a case to verify btrfs-convert feature, it converts an ext4 to > btrfs firstly and do something, then rolls back to ext4. > > So at last we have a ext4 on the scratch device, but setting _require_scratch > will force a btrfsck on a ext4 fs because $FSTYP here is btrfs, and it ends up > with a failure report of _check_btrfs_filesystem. > > Now that we have deliberately check the final ext4 fs in btrfs/012, just do not > set _require_scratch in this case. > > Signed-off-by: Liu Bo <liub.liubo@xxxxxxxxx> > --- > tests/btrfs/012 | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/tests/btrfs/012 b/tests/btrfs/012 > index f7e5da5..12f6462 100755 > --- a/tests/btrfs/012 > +++ b/tests/btrfs/012 > @@ -52,7 +52,6 @@ _cleanup() > # Modify as appropriate. > _supported_fs btrfs > _supported_os Linux > -_require_scratch The test still requires a scratch device, so we cannot simply remove this line. Now we can use _require_scratch_nocheck helper, and it works fine based on my test. Thanks, Eryu > > BTRFS_CONVERT_PROG="`set_prog_path btrfs-convert`" > MKFS_EXT4_PROG="`set_prog_path mkfs.ext4`" > -- > 1.8.1.4 > > _______________________________________________ > xfs mailing list > xfs@xxxxxxxxxxx > http://oss.sgi.com/mailman/listinfo/xfs _______________________________________________ xfs mailing list xfs@xxxxxxxxxxx http://oss.sgi.com/mailman/listinfo/xfs
