Fix test failures with new inode pointer verifiers... and also make sure
that the running xfs actually supports realtime rmap. (This should stop
the current crop of weird test failures since nobody has rtrmap yet
anyway...)
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
tests/xfs/333 | 4 +++-
tests/xfs/333.out | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/xfs/333 b/tests/xfs/333
index f7f233d..af52373 100755
--- a/tests/xfs/333
+++ b/tests/xfs/333
@@ -51,6 +51,8 @@ unset SCRATCH_RTDEV
echo "Format and mount"
_scratch_mkfs > "$seqres.full" 2>&1
+rrmapino="$(_scratch_xfs_db -c 'sb 0' -c 'p rrmapino' 2>&1)"
+test "${rrmapino}" = "field rrmapino not found" && _notrun "realtime rmapbt not supported"
_scratch_mount
echo "Create some files"
@@ -62,7 +64,7 @@ _scratch_unmount
echo "Corrupt fs"
_scratch_xfs_db -x -c 'sb 0' -c "write rrmapino $ino" >> $seqres.full
-_scratch_mount
+_scratch_mount 2>&1 | _filter_scratch
echo "Check files"
md5sum $SCRATCH_MNT/f1 2>&1 | _filter_scratch
diff --git a/tests/xfs/333.out b/tests/xfs/333.out
index bee9bbc..9f81ba4 100644
--- a/tests/xfs/333.out
+++ b/tests/xfs/333.out
@@ -2,8 +2,10 @@ QA output created by 333
Format and mount
Create some files
Corrupt fs
+mount: mount SCRATCH_DEV on SCRATCH_MNT failed: Structure needs cleaning
Check files
-8f27047948255cb84872e2dd7c0bc56d SCRATCH_MNT/f1
+md5sum: SCRATCH_MNT/f1: No such file or directory
Try to create more files
Repair fs
+umount: SCRATCH_DEV: not mounted
Try to create more files (again)
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
