Don't depend on mkfs.xfs output in some tests

Tests 136 and 206 rely on mkfs.xfs output.

136 test was currently broken with hardcoded mkfs.xfs output (that
contained for example meta-data=/dev/sda8). Drop that part from
output.

Ignore projid32bit output existence for test 206.

Signed-off-by: Arkadiusz Miśkiewicz <arekm@maven.pl>
Signed-off-by: Alex Elder <aelder@sgi.com>
This commit is contained in:
Arkadiusz Miśkiewicz
2010-10-02 07:45:19 +00:00
committed by Alex Elder
parent 82faf28da5
commit 06bd0b2f31
3 changed files with 3 additions and 10 deletions
+1 -1
View File
@@ -54,7 +54,7 @@ _supported_os IRIX Linux
_require_scratch
export MKFS_OPTIONS="-i size=512,attr=2"
_scratch_mkfs_xfs
_scratch_mkfs_xfs > /dev/null 2>&1
_scratch_mount
file=$SCRATCH_MNT/file
-8
View File
@@ -1,12 +1,4 @@
QA output created by 136
meta-data=/dev/sda8 isize=512 agcount=8, agsize=31376 blks
= sectsz=512 attr=2, parent=0
data = bsize=4096 blocks=251008, imaxpct=25
= sunit=0 swidth=0 blks, unwritten=1
naming =version 2 bsize=4096
log =internal log bsize=4096 blocks=1200, version=1
= sectsz=512 sunit=0 blks
realtime =none extsz=65536 blocks=0, rtextents=0
inum=67
core.format = 2 (extents)
core.size = 0
+2 -1
View File
@@ -76,7 +76,8 @@ dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864 count=1 >/dev/null 2>&1 \
echo "=== mkfs.xfs ==="
mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b -llazy-count=0 $tmpfile \
| sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/"
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-e "s/, projid32bit=[0-9]//"
mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"