xfs/073: be quiet about mouting with nouuid option
authorEryu Guan <eguan@redhat.com>
Wed, 18 Mar 2015 03:58:05 +0000 (14:58 +1100)
committerDave Chinner <david@fromorbit.com>
Wed, 18 Mar 2015 03:58:05 +0000 (14:58 +1100)
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
tests/xfs/073.out

index 38ed2cb743f0fe722523e71a834af15bb7e8bfd7..07fc71b68581b8088803a99a91474380cd3a7d52 100755 (executable)
@@ -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!
index f3b147e97c06fcf2b3278527ecf86f9ff72897b7..3f2746784884af1e6dc7191ee9de8fba5cb04445 100644 (file)
@@ -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