| Message ID | 1426072534-12246-5-git-send-email-eguan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 3/11/15 7:15 AM, Eryu Guan wrote: > v4 and v5 xfs generate different outputs because v4 xfs only retries > mount with nouuid option once in the test, v5 xfs tries more times(with > xfs_copy running with -d option). > > Just be quiet about mounting with nouuid option, it's much easier than > preparing two different 073.outs and selecting the proper one at runtime Ah, ok, I see now. Might have been better to swap the order of your patches 3 and 4 so things work after each patch application. This does make the test slightly less useful, as we don't know whether we've properly copied the UUID (if for some strange reason it changed when it shouldn't) but that doesn't seem too likely or important, so: Reviewed-by: Eric Sandeen <sandeen@redhat.com> > Signed-off-by: Eryu Guan <eguan@redhat.com> > --- > tests/xfs/073 | 2 +- > tests/xfs/073.out | 1 - > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/tests/xfs/073 b/tests/xfs/073 > index f955771..508725f 100755 > --- a/tests/xfs/073 > +++ b/tests/xfs/073 > @@ -88,7 +88,7 @@ _verify_copy() > > mount -t xfs -o loop $target $target_dir 2>/dev/null > if [ $? -ne 0 ]; then > - echo retrying mount with nouuid option > + echo retrying mount with nouuid option >>$seqres.full > mount -t xfs -o loop -o nouuid $target $target_dir > if [ $? -ne 0 ]; then > echo mount failed - evil! > diff --git a/tests/xfs/073.out b/tests/xfs/073.out > index f3b147e..3f27467 100644 > --- a/tests/xfs/073.out > +++ b/tests/xfs/073.out > @@ -29,7 +29,6 @@ Creating file <FSIMAGE1> > All copies completed. > checking new image > mounting new image on loopback > -retrying mount with nouuid option > comparing new image files to old > comparing new image directories to old > comparing new image geometry to old > -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/xfs/073 b/tests/xfs/073 index f955771..508725f 100755 --- a/tests/xfs/073 +++ b/tests/xfs/073 @@ -88,7 +88,7 @@ _verify_copy() mount -t xfs -o loop $target $target_dir 2>/dev/null if [ $? -ne 0 ]; then - echo retrying mount with nouuid option + echo retrying mount with nouuid option >>$seqres.full mount -t xfs -o loop -o nouuid $target $target_dir if [ $? -ne 0 ]; then echo mount failed - evil! diff --git a/tests/xfs/073.out b/tests/xfs/073.out index f3b147e..3f27467 100644 --- a/tests/xfs/073.out +++ b/tests/xfs/073.out @@ -29,7 +29,6 @@ Creating file <FSIMAGE1> All copies completed. checking new image mounting new image on loopback -retrying mount with nouuid option comparing new image files to old comparing new image directories to old comparing new image geometry to old
v4 and v5 xfs generate different outputs because v4 xfs only retries mount with nouuid option once in the test, v5 xfs tries more times(with xfs_copy running with -d option). Just be quiet about mounting with nouuid option, it's much easier than preparing two different 073.outs and selecting the proper one at runtime Signed-off-by: Eryu Guan <eguan@redhat.com> --- tests/xfs/073 | 2 +- tests/xfs/073.out | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)