From: Eryu Guan <eguan@redhat.com>
To: xfs@oss.sgi.com
Cc: Eryu Guan <eguan@redhat.com>
Subject: [PATCH] xfstests: fix _filter_ro_mount and make xfs/200 pass with old mount
Date: Thu, 31 Oct 2013 18:55:16 +0800 [thread overview]
Message-ID: <1383216916-2211-1-git-send-email-eguan@redhat.com> (raw)
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>
---
common/filter | 2 +-
tests/xfs/200 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/common/filter b/common/filter
index 2390ec0..e37ce69 100644
--- a/common/filter
+++ b/common/filter
@@ -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"
}
diff --git a/tests/xfs/200 b/tests/xfs/200
index f573481..f4db64f 100755
--- a/tests/xfs/200
+++ b/tests/xfs/200
@@ -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
--
1.8.3.1
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2013-10-31 10:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-31 10:55 Eryu Guan [this message]
2013-10-31 11:15 ` [PATCH] xfstests: fix _filter_ro_mount and make xfs/200 pass with old mount Christoph Hellwig
2013-11-04 20:45 ` Rich Johnston
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383216916-2211-1-git-send-email-eguan@redhat.com \
--to=eguan@redhat.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox