On 3/11/15 7:15 AM, Eryu Guan wrote: > xfs_copy doesn't work on v5 xfs without -d option, this fails xfs/073 > when testing xfs with MKFS_OPTIONS="-m crc=1" set.
Neat, I did not know about the "=~" trick ;) Test xfs/073 adds -d already, but two -d's are accepted... ... but the xfs/073 fails due to the fallback to nouuid, forced by the duplicate ID which is found: @@ -17,6 +17,7 @@ All copies completed. checking new image mounting new image on loopback +retrying mount with nouuid option Also: * This will only work until crcs are made default * If $TEST_DEV was made with CRCs then "crc=1" might not be in MKFS_OPTIONS, but xfs_copy of $TEST_DEV would still fail But we only ever use it on $SCRATCH_DEV in tests today, and if/when crcs are made default we can figure out how to test for that later... Still, need some solution that doesn't fail the existing test. We could just _notrun this test with crcs ... talking with hch, I wonder if we even have a use for xfs_copy anymore. A changed-uuid xfs_copy will be very hard to do w/ v5 filesystems. -Eric > Signed-off-by: Eryu Guan <[email protected]> > --- > common/rc | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/common/rc b/common/rc > index 1ed9df5..ad87a18 100644 > --- a/common/rc > +++ b/common/rc > @@ -2926,6 +2926,11 @@ init_rc() > # Figure out if we need to add -F ("foreign", deprecated) option to > xfs_io > xfs_io -c stat $TEST_DIR 2>&1 | grep -q "is not on an XFS filesystem" > && \ > export XFS_IO_PROG="$XFS_IO_PROG -F" > + > + # xfs_copy doesn't work on v5 xfs yet without -d option > + if [ "$FSTYP" == "xfs" ] && [[ $MKFS_OPTIONS =~ crc=1 ]]; then > + export XFS_COPY_PROG="$XFS_COPY_PROG -d" > + fi > } > > # get real device path name by following link > -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
