X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Facceptance-small.sh;h=4be72e6d3445dfa6733c3225367fb1f3b82b7c9b;hb=78057a4d3b156ab2902e7b761f9b98cb3542d09e;hp=ab24ac7c3d68874c5884d6f5d8e138200a80cc5c;hpb=1149a2832178cfda53656e80fdca728f6d2cefda;p=fs%2Flustre-release.git

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index ab24ac7..4be72e6 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -4,8 +4,6 @@
 #set -vx
 set -e
 
-PATH=`dirname $0`/../utils:$PATH
-
 [ -z "$CONFIG" -a "$NAME" ] && CONFIGS=$NAME
 [ "$CONFIGS" ] || CONFIGS="local"  #"local lov"
 [ "$MAX_THREADS" ] || MAX_THREADS=20
@@ -37,13 +35,14 @@ if [ "$ACC_SM_ONLY" ]; then
     done
 fi
 LFSCK="no" # bug 13698
+SANITY_QUOTA="no" # bug 13058
 
 LIBLUSTRETESTS=${LIBLUSTRETESTS:-../liblustre/tests}
 
 STARTTIME=`date +%s`
 RANTEST=""
 
-LUSTRE=${LUSTRE:-`dirname $0`/..}
+LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
 . $LUSTRE/tests/test-framework.sh
 init_test_env $@
 
@@ -250,20 +249,19 @@ for NAME in $CONFIGS; do
 		SANITYN="done"
 	fi
 
+	remote_mds && log "Remote MDS, skipping LFSCK test" && LFSCK=no
+	remote_ost && log "Remote OST, skipping LFSCK test" && LFSCK=no
+
 	if [ "$LFSCK" != "no" -a -x /usr/sbin/lfsck ]; then
 	        title lfsck
 		E2VER=`e2fsck -V 2>&1 | head -n 1 | cut -d' ' -f 2`
-		if grep -q obdfilter /proc/fs/lustre/devices; then
-			if [ `echo $E2VER | cut -d. -f2` -ge 39 ] && \
-			   [ "`echo $E2VER | grep cfs`" -o \
-				"`echo $E2VER | grep sun`" ]; then
-			   		bash lfscktest.sh
-			else
-				e2fsck -V
-				echo "e2fsck does not support lfsck, skipping"
-			fi
+		if [ `echo $E2VER | cut -d. -f2` -ge 39 ] && \
+		   [ "`echo $E2VER | grep cfs`" -o \
+			"`echo $E2VER | grep sun`" ]; then
+		   		bash lfscktest.sh
 		else
-			echo "remote OST, skipping test"
+			e2fsck -V
+			echo "e2fsck does not support lfsck, skipping"
 		fi
 		LFSCK="done"
 	fi
@@ -279,7 +277,7 @@ for NAME in $CONFIGS; do
 		[ -f /etc/modprobe.d/Lustre ] && MODPROBECONF=/etc/modprobe.d/Lustre
 
 		LNETOPTS="$(awk '/^options lnet/ { print $0}' $MODPROBECONF | \
-			sed 's/^options lnet //g') accept=all" \
+			sed 's/^options lnet //g; s/"//g') accept=all" \
 			MDS_MOUNT_OPTS=$(echo $MDS_MOUNT_OPTS | sed 's/^[ \t]*//;s/[ \t]*$//') \
 			MDS_MOUNT_OPTS="${MDS_MOUNT_OPTS},noacl" \
 			MDS_MOUNT_OPTS=${MDS_MOUNT_OPTS/#,/-o } \