From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: <fstests@vger.kernel.org>, <hch@infradead.org>
Cc: <linux-nfs@vger.kernel.org>, <smfrench@gmail.com>, <lczerner@redhat.com>
Subject: [PATCH] common: Re-enable testing over NFS
Date: Thu, 9 Oct 2014 14:27:45 -0400 [thread overview]
Message-ID: <1412879265-32385-1-git-send-email-Anna.Schumaker@Netapp.com> (raw)
83ef157 (common: Check fs consistency on TEST_DEV only when needed) has
_require_test unconditionally return _notrun when testing on an NFS
filesystem, essentially disabling NFS. This patch changes the code to
validate $TEST_DEV and only call _notrun if validation fails.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
common/rc | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/common/rc b/common/rc
index 34d7c19..868007f 100644
--- a/common/rc
+++ b/common/rc
@@ -1086,8 +1086,14 @@ _require_test()
{
case "$FSTYP" in
nfs*)
- _notrun "requires a test device"
- ;;
+ echo $TEST_DEV | grep -q ":/" > /dev/null 2>&1
+ if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
+ _notrun "this test requires a valid \$TEST_DIR"
+ fi
+ if [ ! -d "$TEST_DIR" ]; then
+ _notrun "this test requires a valid \$TEST_DIR"
+ fi
+ ;;
cifs)
echo $TEST_DEV | grep -q "//" > /dev/null 2>&1
if [ -z "$TEST_DEV" -o "$?" != "0" ]; then
--
2.1.2
reply other threads:[~2014-10-09 18:27 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1412879265-32385-1-git-send-email-Anna.Schumaker@Netapp.com \
--to=anna.schumaker@netapp.com \
--cc=fstests@vger.kernel.org \
--cc=hch@infradead.org \
--cc=lczerner@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=smfrench@gmail.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