apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: fix _filter_ro_mount and make xfs/200 pass with old mount

Browse Source 
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.

Signed-off-by: Eryu Guan <eguan@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Eryu Guan
2013-10-31 10:55:16 +00:00
committed by Rich Johnston
parent 4818302fbf
commit fa74b4bdba
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/filter
+1 -1
View File
@@ -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
View File
@@ -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