X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Facceptance-small.sh;h=72825bca7295a6df4b7c8b84d4673a9a14172ac6;hb=ca3c77b8424961e82db642c748e1078ae07e9d97;hp=abe38c8a41d2b6953589024c96d6c19fbaf76395;hpb=090c677210ee2946d99c71412e4ff762bb300f4f;p=fs%2Flustre-release.git

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index abe38c8..72825bc 100755
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -1,166 +1,13 @@
-#!/bin/sh
-# script which _must_ complete successfully (at minimum) before checkins to
-# the CVS HEAD are allowed.
-set -vxe
-
-PATH=`dirname $0`/../utils:$PATH
-
-[ "$CONFIGS" ] || CONFIGS="local lov"
-[ "$MAX_THREADS" ] || MAX_THREADS=10
-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=40960
-[ "$RSIZE" ] || RSIZE=512
-[ "$UID" ] || UID=1000
-[ "$MOUNT" ] || MOUNT=/mnt/lustre
-[ "$MOUNT2" ] || MOUNT2=${MOUNT}2
-[ "$TMP" ] || TMP=/tmp
-[ "$COUNT" ] || COUNT=1000
-#[ "$DEBUG_LVL" ] || DEBUG_LVL=0x370200
-[ "$DEBUG_LVL" ] || DEBUG_LVL=0
-[ "$DEBUG_OFF" ] || DEBUG_OFF="eval echo $DEBUG_LVL > /proc/sys/portals/debug"
-[ "$DEBUG_ON" ] || DEBUG_ON="eval echo -1 > /proc/sys/portals/debug"
-
-for NAME in $CONFIGS; do
-	export NAME MOUNT
-	[ -e $NAME.sh ] && sh $NAME.sh
-	[ ! -e $NAME.xml ] && [ -z "$LDAPURL" ] && \
-		echo "no config '$NAME.xml'" 1>&2 && exit 1
-
-	if [ "$RUNTESTS" != "no" ]; then
-		sh runtests
-	fi
-
-	if [ "$SANITY" != "no" ]; then
-		SANITYLOG=/tmp/sanity.log START=: CLEAN=: sh sanity.sh
-	fi
-
-	if [ "$DBENCH" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
-		SPACE=`df $MOUNT | tail -1 | awk '{ print $4 }'`
-		DB_THREADS=`expr $SPACE / 50000`
-		[ $THREADS -lt $DB_THREADS ] && DB_THREADS=$THREADS
-
-		$DEBUG_OFF
-		sh rundbench 1
-		$DEBUG_ON
-		sh llmountcleanup.sh
-		sh llrmount.sh
-		if [ $DB_THREADS -gt 1 ]; then
-			$DEBUG_OFF
-			sh rundbench $DB_THREADS
-			$DEBUG_ON
-			sh llmountcleanup.sh
-			sh llrmount.sh
-		fi
-		rm -f /mnt/lustre/`hostname`/client.txt
-	fi
-	chown $UID $MOUNT && chmod 700 $MOUNT
-	if [ "$BONNIE" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
-		$DEBUG_OFF
-		bonnie++ -f -r 0 -s $(($SIZE / 1024)) -n 10 -u $UID -d $MOUNT
-		$DEBUG_ON
-		sh llmountcleanup.sh
-		sh llrmount.sh
-	fi
-	IOZONE_OPTS="-i 0 -i 1 -i 2 -+d -r $RSIZE -s $SIZE"
-	if [ "$O_DIRECT" -a  "$O_DIRECT" != "no" ]; then
-	    IOZONE_OPTS="-I $IOZONE_OPTS"
-	fi
-	IOZONE_FILE="-f $MOUNT/iozone"
-	if [ "$IOZONE" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
-		$DEBUG_OFF
-		iozone $IOZONE_OPTS $IOZONE_FILE
-		$DEBUG_ON
-		sh llmountcleanup.sh
-		sh llrmount.sh
-	fi
-	if [ "$IOZONE_DIR" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
-		SPACE=`df $MOUNT | tail -1 | awk '{ print $4 }'`
-		IOZ_THREADS=`expr $SPACE / \( $SIZE + $SIZE / 512 \)`
-		[ $THREADS -lt $IOZ_THREADS ] && IOZ_THREADS=$THREADS
-
-		$DEBUG_OFF
-		iozone $IOZONE_OPTS $IOZONE_FILE.odir
-		IOZVER=`iozone -v | awk '/Revision:/ { print $3 }' | tr -d '.'`
-		$DEBUG_ON
-		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 $MOUNT/iozone.$THREAD"
-				THREAD=`expr $THREAD + 1`
-			done
-			iozone $IOZONE_OPTS -t $IOZ_THREADS $IOZONE_FILE
-			$DEBUG_ON
-			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 $MOUNT || sh llmount.sh
-		$DEBUG_OFF
-		./fsx -W -c 50 -p 1000 -P $TMP -l $SIZE \
-			-N $(($COUNT * 100)) $MOUNT/fsxfile
-		$DEBUG_ON
-		sh llmountcleanup.sh
-		sh llrmount.sh
-	fi	
-	if [ "$SANITYN" != "no" ]; then
-		mount | grep $MOUNT || sh llmount.sh
-		$DEBUG_OFF
-
-		mkdir -p $MOUNT2
-		case $NAME in
-		local|lov)
-			MDSNODE=`hostname`
-			MDSNAME=mds1
-			CLIENT=client
-			;;
-		*)	# we could extract this from $NAME.xml somehow
-			;;
-		esac
-		if [ "$MDSNODE" -a "$MDSNAME" -a "$CLIENT" ]; then
-			llmount $MDSNODE:/$MDSNAME/$CLIENT $MOUNT2
-			SANITYLOG=$TMP/sanity.log START=: CLEAN=: sh sanityN.sh
-			umount $MOUNT2
-		else
-			echo "don't know \$MDSNODE, \$MDSNAME, \$CLIENT"
-			echo "can't mount2 for '$NAME', skipping sanityN.sh"
-		fi
-
-		$DEBUG_ON
-		sh llmountcleanup.sh
-		#sh llrmount.sh
-	fi
-
-	mount | grep $MOUNT && sh llmountcleanup.sh
+#!/bin/bash
+#
+# usage: acceptance-small.sh [test list]
+#	if no tests are specified, they are taken from test-groups/regression
+#	if {TEST_NAME}=no is set, that test script is skipped
+DEFAULT_SUITES="${@:-$ACC_SM_ONLY}"
+DEFAULT_SUITES="${DEFAULT_SUITES:-$(cat $LUSTRE/tests/test-groups/regression)}"
+for SUB in $DEFAULT_SUITES; do
+	ENV=$(echo $SUB | tr "[:lower:]-" "[:upper:]_")
+	[ "$(eval echo \$$ENV)" = "no" ] && continue
+	SUITES="$SUITES $SUB"
 done
-
-if [ "$REPLAY_SINGLE" != "no" ]; then
-	sh replay-single.sh
-fi
-
-if [ "$CONF_SANITY" != "no" ]; then
-        sh conf-sanity.sh
-fi
-
-if [ "$RECOVERY_SMALL" != "no" ]; then
-        sh recovery-small.sh
-fi
-
-if [ "$REPLAY_OST_SINGLE" != "no" ]; then
-        sh replay-ost-single.sh
-fi
+sh auster -r -R -v -f ${NAME:-lustre} $SUITES