xfstests: fix _filter_ro_mount and make xfs/200 pass with old mount
PATCH 1/1 xfstests: fix _filter_ro_mount and make xfs/200 pass with old mount
We just want to remove "block device" in _filter_ro_mount(), so add "mount:" back.
Add one more call of _filter_ro_mount() in xfs/200 to match 200.out.
--- common/filter | 2 +- tests/xfs/200 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
common/filter +1 -1
@@ -308,7 +308,7 @@ _filter_fstrim() # Older mount output referred to "block device" when mounting RO devices # It's gone in newer versions _filter_ro_mount() { - sed -e "s/mount: block device//g" \ + sed -e "s/mount: block device/mount:/g" \ -e "s/mount: cannot mount block device/mount: cannot mount/g" }
tests/xfs/200 +1 -1
@@ -58,7 +58,7 @@ blockdev --setro $SCRATCH_DEV # Mount it, and make sure we can't write to it, and we can unmount it again # echo "mounting read-only block device:" -_scratch_mount 2>&1 | _filter_scratch +_scratch_mount 2>&1 | _filter_scratch | _filter_ro_mount echo "touching file on read-only filesystem (should fail)" touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
Signature · 6 lines
1.8.3.1 _______________________________________________ xfs mailing list [email protected] http://oss.sgi.com/mailman/listinfo/xfs
Quoted 4 lines · Eryu Guan
We just want to remove "block device" in
_filter_ro_mount(), so add "mount:" back.Add one more call of
_filter_ro_mount()in xfs/200 to match 200.out.
Thanks, I've seen this issue too but didn't have time to debug it yet.
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
This has been committed.
Thanks
--Rich
commit fa74b4bdba5a8ecf0c81c65307e1a9af53616370
Author: Eryu Guan <[email protected]> Date: Thu Oct 31 10:55:16 2013 +0000
xfstests: fix _filter_ro_mount and make xfs/200 pass with old mount
_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs