From: fsgqa <fsgqa>
Date: Tue, 29 Jul 2003 21:32:23 +0000 (+0000)
Subject: Fix test 067 when non-default mkfs options are in use
X-Git-Tag: v1.1.0~954
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=127990335ef11555b8002bbe9463fdd36609d958;p=xfstests-dev.git

Fix test 067 when non-default mkfs options are in use
---

diff --git a/067 b/067
index 8312ac43..74ecbd1b 100755
--- a/067
+++ b/067
@@ -52,19 +52,23 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 . ./common.attr
 
 # real QA test starts here
-
-
+# 
 _need_to_be_root
 _acl_requirements
 _require_scratch
 
 # set up fs for 1K inodes
-_scratch_mkfs_xfs -i size=1024 >>$here/$seq.full || _fail "mkfs failed"
+isize=0
+_scratch_mkfs_xfs | _filter_mkfs >$seq.full 2>$tmp.mkfs
+[ $? -eq 0 ] && source $tmp.mkfs
+if [ "$isize" -lt 1024 ]; then
+    _scratch_mkfs_xfs -i size=1024 >>$here/$seq.full \
+	|| _notrun "Cannot mkfs for this test using MKFS_OPTIONS specified"
+fi
 _scratch_mount >>$here/$seq.full || _fail "mount failed"
+xfs_info $SCRATCH_MNT >>$here/$seq.full
 cd $SCRATCH_MNT
 
-# xfs_growfs -n $SCRATCH_MNT
-
 echo ""
 echo "=== Test out large ACLs  ==="