From: Eryu Guan <eguan@redhat.com>
To: fstests@vger.kernel.org
Cc: linux-nfs@vger.kernel.org, Eryu Guan <eguan@redhat.com>
Subject: [PATCH 1/4] common: re-enable tests that require scratch dev on NFS
Date: Tue, 28 Oct 2014 21:16:08 +0800 [thread overview]
Message-ID: <1414502171-10319-2-git-send-email-eguan@redhat.com> (raw)
In-Reply-To: <1414502171-10319-1-git-send-email-eguan@redhat.com>
This commit disables tests requires scratch dev running on NFS
c041421 xfstests: stop special casing nfs and udf
Now re-enable them to get a larger test coverage on NFS.
Signed-off-by: Eryu Guan <eguan@redhat.com>
---
common/rc | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/common/rc b/common/rc
index 747cf72..8738da7 100644
--- a/common/rc
+++ b/common/rc
@@ -558,7 +558,11 @@ _scratch_mkfs()
_scratch_mkfs_xfs $*
;;
nfs*)
- # do nothing for nfs
+ # unable to re-create NFS, just remove all files in $SCRATCH_MNT to
+ # avoid EEXIST caused by the leftover files created in previous runs
+ _scratch_mount
+ rm -rf $SCRATCH_MNT/*
+ _scratch_unmount
;;
cifs)
# do nothing for cifs
@@ -1032,8 +1036,14 @@ _require_scratch_nocheck()
{
case "$FSTYP" in
nfs*)
- _notrun "requires a scratch device"
- ;;
+ echo $SCRATCH_DEV | grep -q ":/" > /dev/null 2>&1
+ if [ -z "$SCRATCH_DEV" -o "$?" != "0" ]; then
+ _notrun "this test requires a valid \$SCRATCH_DEV"
+ fi
+ if [ ! -d "$SCRATCH_MNT" ]; then
+ _notrun "this test requires a valid \$SCRATCH_MNT"
+ fi
+ ;;
cifs)
_notrun "requires a scratch device"
;;
--
1.8.3.1
next prev parent reply other threads:[~2014-10-28 13:16 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-28 13:16 [RFC PATCH 0/4] re-enable tests that require scratch dev on NFS Eryu Guan
2014-10-28 13:16 ` Eryu Guan [this message]
2014-10-28 13:22 ` [PATCH 1/4] common: " Christoph Hellwig
2014-10-29 6:59 ` Eryu Guan
2014-10-28 13:16 ` [PATCH 2/4] common: add _require_block_device() helper Eryu Guan
2014-10-28 13:24 ` Christoph Hellwig
2014-10-28 13:16 ` [PATCH 3/4] common: skip atime related tests on NFS Eryu Guan
2014-10-30 9:03 ` nfs atime semantics, was: " Christoph Hellwig
2014-10-31 8:13 ` Eryu Guan
2014-10-31 11:31 ` Trond Myklebust
2014-11-02 18:02 ` Boaz Harrosh
2014-11-05 8:29 ` Christoph Hellwig
2014-10-28 13:16 ` [PATCH 4/4] generic/277: add _require_attrs Eryu Guan
2014-10-28 13:23 ` Christoph Hellwig
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=1414502171-10319-2-git-send-email-eguan@redhat.com \
--to=eguan@redhat.com \
--cc=fstests@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.