branch: HEAD

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

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 4e203a6..8d25297 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -25,11 +25,6 @@ fi
 [ "$DEBUG_OFF" ] || DEBUG_OFF="eval sysctl -w lnet.debug=\"$DEBUG_LVL\""
 [ "$DEBUG_ON" ] || DEBUG_ON="eval sysctl -w lnet.debug=0x33f0484"
 
-
-
-LIBLUSTRE=${LIBLUSTRE:-../liblustre}
-LIBLUSTRETESTS=${LIBLUSTRETESTS:-$LIBLUSTRE/tests}
-
 if [ "$ACC_SM_ONLY" ]; then
     export RUNTESTS="no" SANITY="no" DBENCH="no" BONNIE="no" IOZONE="no" FSX="no" SANITYN="no" LFSCK="no" LIBLUSTRE="no" REPLAY_SINGLE="no" CONF_SANITY="no" RECOVERY_SMALL="no" REPLAY_OST_SINGLE="no" REPLAY_DUAL="no" INSANITY="no" SANITY_QUOTA="no"
     for O in $ACC_SM_ONLY; do
@@ -38,6 +33,8 @@ if [ "$ACC_SM_ONLY" ]; then
     done
 fi
 
+LIBLUSTRETESTS=${LIBLUSTRETESTS:-../liblustre/tests}
+
 STARTTIME=`date +%s`
 RANTEST=""
 
@@ -56,6 +53,7 @@ setup_if_needed() {
 
 title() {
     echo "-----============= acceptance-small: "$*" ============-----"
+    $LCTL mark "----===== $* =====----" 2> /dev/null || true
     RANTEST=${RANTEST}$*", "
 }
 
@@ -71,14 +69,14 @@ for NAME in $CONFIGS; do
 
        if [ "$RUNTESTS" != "no" ]; then
                title runtests
-               sh runtests
+               bash runtests
                $CLEANUP
                $SETUP
        fi
 
        if [ "$SANITY" != "no" ]; then
                title sanity
-               sh sanity.sh
+               bash sanity.sh
                $CLEANUP
                $SETUP
        fi
@@ -91,13 +89,13 @@ for NAME in $CONFIGS; do
                [ $THREADS -lt $DB_THREADS ] && DB_THREADS=$THREADS
 
                $DEBUG_OFF
-               sh rundbench 1
+               bash rundbench 1
                $DEBUG_ON
                $CLEANUP
                $SETUP
                if [ $DB_THREADS -gt 1 ]; then
                        $DEBUG_OFF
-                       sh rundbench $DB_THREADS
+                       bash rundbench $DB_THREADS
                        $DEBUG_ON
                        $CLEANUP
                        $SETUP
@@ -125,9 +123,11 @@ for NAME in $CONFIGS; do
                SPACE=`df -P $MOUNT | tail -n 1 | awk '{ print $4 }'`
                [ $SPACE -lt $SIZE ] && SIZE=$((SPACE * 3 / 4))
                IOZONE_OPTS="-i 0 -i 1 -i 2 -e -+d -r $RSIZE -s $SIZE"
-               IOZFILE="-f $MOUNT/iozone"
+               IOZFILE="$MOUNT/iozone"
+               # $SPACE was calculated with all OSTs
+               $LFS setstripe $IOZFILE 0 -1 -1
                $DEBUG_OFF
-               iozone $IOZONE_OPTS $IOZFILE
+               iozone $IOZONE_OPTS -f $IOZFILE
                $DEBUG_ON
                $CLEANUP
                $SETUP
@@ -189,7 +189,7 @@ for NAME in $CONFIGS; do
                mkdir -p $MOUNT2
                mount_client $MOUNT2
                #echo "can't mount2 for '$NAME', skipping sanityN.sh"
-               START=: CLEAN=: sh sanityN.sh
+               START=: CLEAN=: bash sanityN.sh
                umount $MOUNT2
 
                $DEBUG_ON
@@ -203,7 +203,7 @@ for NAME in $CONFIGS; do
                if grep -q obdfilter /proc/fs/lustre/devices; then
                        if [ `echo $E2VER | cut -d. -f2` -ge 39 ] && \
                           [ "`echo $E2VER | grep cfs`" ]; then
-                               sh lfscktest.sh
+                               bash lfscktest.sh
                        else
                                e2fsck -V
                                echo "e2fsck does not support lfsck, skipping"
@@ -229,6 +229,7 @@ for NAME in $CONFIGS; do
                #export LIBLUSTRE_DEBUG_MASK=`cat /proc/sys/lnet/debug`
                if [ -x $LIBLUSTRETESTS/sanity ]; then
                        mkdir -p $MOUNT2
+                       echo $LIBLUSTRETESTS/sanity --target=$LIBLUSTRE_MOUNT_TARGET
                        $LIBLUSTRETESTS/sanity --target=$LIBLUSTRE_MOUNT_TARGET
                fi
                $CLEANUP
@@ -240,37 +241,37 @@ done
 
 if [ "$REPLAY_SINGLE" != "no" ]; then
         title replay-single
-       sh replay-single.sh
+       bash replay-single.sh
 fi
 
 if [ "$CONF_SANITY" != "no" ]; then
         title conf-sanity
-        sh conf-sanity.sh
+        bash conf-sanity.sh
 fi
 
 if [ "$RECOVERY_SMALL" != "no" ]; then
         title recovery-small
-        sh recovery-small.sh
+        bash recovery-small.sh
 fi
 
 if [ "$REPLAY_OST_SINGLE" != "no" ]; then
         title replay-ost-single
-        sh replay-ost-single.sh
+        bash replay-ost-single.sh
 fi
 
 if [ "$REPLAY_DUAL" != "no" ]; then
         title replay-dual
-        sh replay-dual.sh
+        bash replay-dual.sh
 fi
 
 if [ "$INSANITY" != "no" ]; then
         title insanity
-        sh insanity.sh -r
+        bash insanity.sh -r
 fi
 
 if [ "$SANITY_QUOTA" != "no" ]; then
         title sanity-quota
-        sh sanity-quota.sh
+        bash sanity-quota.sh
 fi