From: Alex Elder <aelder@sgi.com>
Date: Wed, 13 Jul 2011 20:28:48 +0000 (+0000)
Subject: xfstests: update test 250 and its golden output
X-Git-Tag: v1.1.0~37
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0be5cdd6358195c3f3228d2754835c3b11d6a159;p=xfstests-dev.git

xfstests: update test 250 and its golden output

Test 250 actually runs now that it has golden output defined.  The
output the test produces doesn't match the golden output, however.

The main reason seems to be a oversight in the test--the stderr
output of mkfs wasn't being ignored as it should be (likely for
debugging).  Remove the comment character so the stderr does get
ignored.

Doing this still leaves some other output, but since it's filtered
there's no reason to leave it out of the golden output.  So add
the expected result of filtering into the golden output file.

Finally, this test--unlike almost all of the others--specifies the
value of its "tmp" variable as a relative rather than absolute
path.  I'm sure that works in some places, but it produces errors
for me.  Follow the "tmp=/tmp/$$" convention used elsewhere.

Signed-off-by: Alex Elder <aelder@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/250 b/250
index cb0fa9c9..92e3cc5f 100755
--- a/250
+++ b/250
@@ -27,7 +27,7 @@ seq=`basename $0`
 echo "QA output created by $seq"
 
 here=`pwd`
-tmp=tmp/$$
+tmp=/tmp/$$
 status=1  # failure is the default!
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -76,7 +76,7 @@ _test_loop()
 
 	echo "*** mkfs loop file (size=$size)"
 	$MKFS_XFS_PROG -d $dparam \
-		| _filter_mkfs # 2>/dev/null
+		| _filter_mkfs 2>/dev/null
 
 	echo "*** mount loop filesystem"
 	mount -t xfs -o loop $LOOP_DEV $LOOP_MNT
diff --git a/250.out b/250.out
index 79f19a40..2225d6ed 100644
--- a/250.out
+++ b/250.out
@@ -1,6 +1,12 @@
 QA output created by 250
 *** create loop mount point
 *** mkfs loop file (size=50g)
+meta-data=DDEV isize=XXX agcount=N, agsize=XXX blks
+data     = bsize=XXX blocks=XXX, imaxpct=PCT
+         = sunit=XXX swidth=XXX, unwritten=X
+naming   =VERN bsize=XXX
+log      =LDEV bsize=XXX blocks=XXX
+realtime =RDEV extsz=XXX blocks=XXX, rtextents=XXX
 *** mount loop filesystem
 *** preallocate large file
 *** unmount loop filesystem