X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Facceptance-small.sh;h=bee65884252f30d762b9bfde45d9282815690ebc;hb=040033cef24c5aca2967daf2da7a862abcd074cf;hp=6a3a2a917fca178141bc27dde7ca7a566faa73e7;hpb=4084105a9e7888ef1252eeb57f46a61f44038d3d;p=fs%2Flustre-release.git

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 6a3a2a9..bee6588 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -2,20 +2,110 @@
 # script which _must_ complete successfully (at minimum) before checkins to
 # the CVS HEAD are allowed.
 set -vxe
-sh local.sh
-sh runtests --reformat local.xml
-
-sh lov.sh
-sh runtests --reformat lov.xml
-
-export NAME=local
-sh llmount.sh
-sh sanity
-sh rundbench 1
-sh llmountcleanup.sh
-
-export NAME=lov
-llmount.sh
-sh sanity
-sh rundbench 1
-sh llmountcleanup.sh
+
+[ "$CONFIGS" -a -z "$SANITYN" ] && SANITYN=no
+[ "$CONFIGS" ] || CONFIGS="local lov"
+[ "$MAX_THREADS" ] || MAX_THREADS=50
+if [ -z "$THREADS" ]; then
+	KB=`awk '/MemTotal:/ { print $2 }' /proc/meminfo`
+	THREADS=`expr $KB / 16384`
+	[ $THREADS -gt $MAX_THREADS ] && THREADS=$MAX_THREADS
+fi
+[ "$SIZE" ] || SIZE=20480
+[ "$RSIZE" ] || RSIZE=64
+[ "$UID" ] || UID=1000
+[ "$MNT" ] || MNT=/mnt/lustre
+[ "$TMP" ] || TMP=/tmp
+[ "$COUNT" ] || COUNT=1000
+[ "$DEBUG_OFF" ] || DEBUG_OFF="eval echo 0 > /proc/sys/portals/debug"
+
+for NAME in $CONFIGS; do
+	export NAME
+	[ -e $NAME.sh ] && sh $NAME.sh
+	[ ! -e $NAME.xml ] && echo "no config '$NAME.xml'" 1>&2 && exit 1
+
+	if [ "$RUNTESTS" != "no" ]; then
+		sh runtests
+	fi
+
+	[ "$SANITY" != "no" ] && sh sanity.sh
+	[ "$SANITY" != "no" ] && START=" " CLEAN=" " sh sanity.sh
+
+	if [ "$DBENCH" != "no" ]; then
+		mount | grep $MNT || sh llmount.sh
+		SPACE=`df $MNT | tail -1 | awk '{ print $4 }'`
+		DB_THREADS=`expr $SPACE / 50000`
+		[ $THREADS -lt $DB_THREADS ] && DB_THREADS=$THREADS
+
+		$DEBUG_OFF
+		sh rundbench 1
+		sh llmountcleanup.sh
+		sh llrmount.sh
+		if [ $DB_THREADS -gt 1 ]; then
+			$DEBUG_OFF
+			sh rundbench $DB_THREADS
+			sh llmountcleanup.sh
+			sh llrmount.sh
+		fi
+		rm -f /mnt/lustre/client.txt
+	fi
+	chown $UID $MNT && chmod 700 $MNT
+	if [ "$BONNIE" != "no" ]; then
+		mount | grep $MNT || sh llmount.sh
+		$DEBUG_OFF
+		bonnie++ -s 0 -n 10 -u $UID -d $MNT
+		sh llmountcleanup.sh
+		sh llrmount.sh
+	fi
+	IOZONE_OPTS="-i 0 -i 1 -i 2 -+d -r $RSIZE -s $SIZE"
+	IOZONE_FILE="-f $MNT/iozone"
+	if [ "$IOZONE" != "no" ]; then
+		mount | grep $MNT || sh llmount.sh
+		$DEBUG_OFF
+		iozone $IOZONE_OPTS $IOZONE_FILE
+		sh llmountcleanup.sh
+		sh llrmount.sh
+	fi
+	if [ "$IOZONE_DIR" != "no" ]; then
+		mount | grep $MNT || sh llmount.sh
+		SPACE=`df $MNT | tail -1 | awk '{ print $4 }'`
+		IOZ_THREADS=`expr $SPACE / $SIZE`
+		[ $THREADS -lt $IOZ_THREADS ] && IOZ_THREADS=$THREADS
+
+		$DEBUG_OFF
+		iozone -I $IOZONE_OPTS $IOZONE_FILE.odir
+		IOZVER=`iozone -v | awk '/Revision:/ { print $3 }' | tr -d '.'`
+		sh llmountcleanup.sh
+		sh llrmount.sh
+		if [ "$IOZ_THREADS" -gt 1 -a "$IOZVER" -ge 3145 ]; then
+			$DEBUG_OFF
+			THREAD=1
+			IOZONE_FILE="-F "
+			while [ $THREAD -le $IOZ_THREADS ]; do
+				IOZONE_FILE="$IOZONE_FILE $MNT/iozone.$THREAD"
+				THREAD=`expr $THREAD + 1`
+			done
+			iozone -I $IOZONE_OPTS -t $IOZ_THREADS $IOZONE_FILE
+			sh llmountcleanup.sh
+			sh llrmount.sh
+		elif [ $IOZVER -lt 3145 ]; then
+			VER=`iozone -v | awk '/Revision:/ { print $3 }'`
+			echo "iozone $VER too old for multi-threaded tests"
+		fi
+	fi
+	if [ "$FSX" != "no" ]; then
+		mount | grep $MNT || sh llmount.sh
+		$DEBUG_OFF
+		./fsx -W -c 50 -p 1000 -P $TMP -l 1024000 -N $(($COUNT * 100)) $MNT/fsxfile
+		sh llmountcleanup.sh
+		#sh llrmount.sh
+	fi	
+	mount | grep $MNT && sh llmountcleanup.sh
+done
+
+if [ "$SANITYN" != "no" ]; then
+	export NAME=mount2
+	mount | grep $MNT || sh llmount.sh
+	sh sanityN.sh
+	mount | grep $MNT && sh llmountcleanup.sh
+fi