xfs
[Top] [All Lists]

[PATCH] xfs/005: filter _scratch_mount output and fix golden output to m

To: fstests@xxxxxxxxxxxxxxx
Subject: [PATCH] xfs/005: filter _scratch_mount output and fix golden output to match it
From: Eryu Guan <eguan@xxxxxxxxxx>
Date: Fri, 23 May 2014 00:17:09 +0800
Cc: xfs@xxxxxxxxxxx, Eryu Guan <eguan@xxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
Failure message of _scratch_mount is something like:

mount: mount /dev/sda5 on /mnt/scratch failed: Structure needs cleaning

not

mount: Structure needs cleaning

Filter the output and fix the golden image to match the new output.

Signed-off-by: Eryu Guan <eguan@xxxxxxxxxx>
---
 tests/xfs/005     | 2 +-
 tests/xfs/005.out | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/xfs/005 b/tests/xfs/005
index 94157c4..534f910 100755
--- a/tests/xfs/005
+++ b/tests/xfs/005
@@ -59,7 +59,7 @@ _scratch_mkfs_xfs -m crc=1 >> $seqres.full 2>&1 || _fail 
"mkfs failed"
 $XFS_IO_PROG -c "pwrite 224 4" $SCRATCH_DEV | _filter_xfs_io
 
 # should FAIL, the crc is bad; golden output contains mount failure
-_scratch_mount
+_scratch_mount 2>&1 | _filter_scratch
 
 # success, all done
 status=0
diff --git a/tests/xfs/005.out b/tests/xfs/005.out
index 13d0125..853e446 100644
--- a/tests/xfs/005.out
+++ b/tests/xfs/005.out
@@ -1,4 +1,4 @@
 QA output created by 005
 wrote 4/4 bytes at offset 224
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-mount: Structure needs cleaning
+mount: mount SCRATCH_DEV on SCRATCH_MNT failed: Structure needs cleaning
-- 
1.9.0

<Prev in Thread] Current Thread [Next in Thread>