X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Frun_IOR.sh;h=9f8f816e52d26f3d12856a0fb41b8ac1076d6e18;hb=214bb48cd628441a77e97ffba409bfc5ad4e501b;hp=6da7f54f3101940343d27f86e55ae9e877a85675;hpb=e2cd3061d9419393bc55b19df2d9d51d0cbe8932;p=fs%2Flustre-release.git

diff --git a/lustre/tests/run_IOR.sh b/lustre/tests/run_IOR.sh
index 6da7f54..9f8f816 100755
--- a/lustre/tests/run_IOR.sh
+++ b/lustre/tests/run_IOR.sh
@@ -1,16 +1,19 @@
 #!/bin/bash
-set -x
 
 TMP=${TMP:-/tmp}
 
-TESTSUITELOG=${TESTSUITELOG:-$TMP/recovery-mds-scale}
-LOG=${TESTSUITELOG}_$(basename $0)-$(hostname)
-DEBUGLOG=${LOG}.debug
+TESTLOG_PREFIX=${TESTLOG_PREFIX:-$TMP/recovery-mds-scale}
+TESTNAME=${TESTNAME:-""}
+[ -n "$TESTNAME" ] && TESTLOG_PREFIX=$TESTLOG_PREFIX.$TESTNAME
+
+LOG=$TESTLOG_PREFIX.$(basename $0 .sh)_stdout.$(hostname -s).log
+DEBUGLOG=$(echo $LOG | sed 's/\(.*\)stdout/\1debug/')
 
 mkdir -p ${LOG%/*}
 
 rm -f $LOG $DEBUGLOG
 exec 2>$DEBUGLOG
+set -x
 
 . $(dirname $0)/functions.sh
 
@@ -46,19 +49,19 @@ while [ ! -e "$END_RUN_FILE" ] && $CONTINUE; do
     load_pid=$!
     wait $load_pid
     if [ ${PIPESTATUS[0]} -eq 0 ]; then
-	echoerr "$(date +'%F %H:%M:%S'): IOR succeeded"
-	cd $TMP
-	rm -rf $TESTDIR
-	echoerr "$(date +'%F %H:%M:%S'): IOR run finished"
+        echoerr "$(date +'%F %H:%M:%S'): IOR succeeded"
+        cd $TMP
+        rm -rf $TESTDIR
+        echoerr "$(date +'%F %H:%M:%S'): IOR run finished"
     else
-	echoerr "$(date +'%F %H:%M:%S'): IOR failed"
-	if [ -z "$ERRORS_OK" ]; then
-	    echo $(hostname) >> $END_RUN_FILE
-	fi
-	if [ $BREAK_ON_ERROR ]; then
-	    # break
+        echoerr "$(date +'%F %H:%M:%S'): IOR failed"
+        if [ -z "$ERRORS_OK" ]; then
+            echo $(hostname) >> $END_RUN_FILE
+        fi
+        if [ $BREAK_ON_ERROR ]; then
+            # break
             CONTINUE=false
-	fi
+        fi
     fi
 done