From 74984c55c7c09b40eb97426dd77e98a881c7e273 Mon Sep 17 00:00:00 2001 From: Eryu Guan Date: Wed, 18 Mar 2015 14:58:05 +1100 Subject: [PATCH] xfs/073: be quiet about mouting with nouuid option 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 --- 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 38ed2cb7..07fc71b6 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 f3b147e9..3f274678 100644 --- a/tests/xfs/073.out +++ b/tests/xfs/073.out @@ -29,7 +29,6 @@ Creating file 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 -- 2.39.5