From: Jie Liu <jeff.liu@xxxxxxxxxx>
Refactor xfs/299 to make use of those two crc related pre-checkup
routines, and remove the super block number from the golden output
file as it does not make sense IMO. Also, filter out *EXPERIMENTAL*
string from mkfs.xfs output as those contents would be removed once
crc feature becomes stable.
Signed-off-by: Jie Liu <jeff.liu@xxxxxxxxxx>
---
tests/xfs/299 | 14 ++++----------
tests/xfs/299.out | 1 -
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/tests/xfs/299 b/tests/xfs/299
index d5e8c5e..e374131 100755
--- a/tests/xfs/299
+++ b/tests/xfs/299
@@ -54,6 +54,8 @@ chmod a+rwx $seqres.full # arbitrary users will write here
_require_scratch
_require_xfs_quota
+_require_xfs_mkfs_crc
+_require_xfs_crc
bsoft=100
bhard=500
@@ -193,19 +195,11 @@ _exercise()
}
-_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
+_scratch_mkfs_xfs -m crc=1 2>/dev/null | _filter_mkfs 2>$tmp.mkfs
cat $tmp.mkfs >>$seqres.full
# keep the blocksize and data size for dd later
. $tmp.mkfs
-sb_ver=`$XFS_DB_PROG -r -c version $SCRATCH_DEV | awk -F= '{print $2}' | awk -F, '{print $1}' |cut -c3-`
-echo $sb_ver
-
-if [ $sb_ver -lt 5 ]
-then
- _notrun "Can't run with older versions of superblock"
-fi
-
cat >$tmp.projects <<EOF
1:$SCRATCH_MNT
EOF
@@ -228,7 +222,7 @@ echo "*** unmount"
umount $SCRATCH_MNT
-_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
+_scratch_mkfs_xfs -m crc=1 2>/dev/null | _filter_mkfs 2>$tmp.mkfs
cat $tmp.mkfs >>$seqres.full
# keep the blocksize and data size for dd later
. $tmp.mkfs
diff --git a/tests/xfs/299.out b/tests/xfs/299.out
index b2699b4..4185c98 100644
--- a/tests/xfs/299.out
+++ b/tests/xfs/299.out
@@ -5,7 +5,6 @@ data = bsize=XXX blocks=XXX, imaxpct=PCT
naming =VERN bsize=XXX
log =LDEV bsize=XXX blocks=XXX
realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
-5
*** user, group, and project
*** report no quota settings
--
1.8.3.2
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
