merge b_devel into HEAD, which will become 0.7.3

[fs/lustre-release.git] / lustre / tests / acceptance-small.sh

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index e874f5d..919ea1f 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -5,7 +5,7 @@ set -vxe
 
 [ "$CONFIGS" -a -z "$SANITYN" ] && SANITYN=no
 [ "$CONFIGS" ] || CONFIGS="local lov"
-[ "$MAX_THREADS" ] || MAX_THREADS=50
+[ "$MAX_THREADS" ] || MAX_THREADS=10
 if [ -z "$THREADS" ]; then
        KB=`awk '/MemTotal:/ { print $2 }' /proc/meminfo`
        THREADS=`expr $KB / 16384`
@@ -29,8 +29,10 @@ for NAME in $CONFIGS; do
                sh runtests
        fi
 
-       [ "$SANITY" != "no" ] && sh sanity.sh
-       [ "$SANITY" != "no" ] && START=" " CLEAN=" " sh sanity.sh
+       #[ "$SANITY" != "no" ] && sh sanity.sh
+       if [ "$SANITY" != "no" ]; then
+               START=: CLEAN=: sh sanity.sh
+       fi
 
        if [ "$DBENCH" != "no" ]; then
                mount | grep $MNT || sh llmount.sh
@@ -74,7 +76,7 @@ for NAME in $CONFIGS; do
        if [ "$IOZONE_DIR" != "no" ]; then
                mount | grep $MNT || sh llmount.sh
                SPACE=`df $MNT | tail -1 | awk '{ print $4 }'`
-               IOZ_THREADS=`expr $SPACE / $SIZE`
+               IOZ_THREADS=`expr $SPACE / \( $SIZE + $SIZE / 1000 \)`
                [ $THREADS -lt $IOZ_THREADS ] && IOZ_THREADS=$THREADS
 
                $DEBUG_OFF