public inbox for linux-nfs@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] common: Re-enable testing over NFS
@ 2014-10-09 18:27 Anna Schumaker
  0 siblings, 0 replies; only message in thread
From: Anna Schumaker @ 2014-10-09 18:27 UTC (permalink / raw)
  To: fstests, hch; +Cc: linux-nfs, smfrench, lczerner

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


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2014-10-09 18:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-09 18:27 [PATCH] common: Re-enable testing over NFS Anna Schumaker

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox