common: Re-enable testing over NFS

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>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Anna Schumaker
2014-10-14 22:59:38 +11:00
committed by Dave Chinner
parent 50f2346560
commit 19c805e005
+8 -2
View File
@@ -1092,8 +1092,14 @@ _require_test()
{ {
case "$FSTYP" in case "$FSTYP" in
nfs*) 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) cifs)
echo $TEST_DEV | grep -q "//" > /dev/null 2>&1 echo $TEST_DEV | grep -q "//" > /dev/null 2>&1
if [ -z "$TEST_DEV" -o "$?" != "0" ]; then if [ -z "$TEST_DEV" -o "$?" != "0" ]; then