QA updates.

[xfstests-dev.git] / bench

diff --git a/bench b/bench
index 252600ed5673d1d39edb92ccafdab0a04d309412..f1acdc2b0a7bdff181b65254860f0059568065fa 100755 (executable)
--- a/bench
+++ b/bench
@@ -50,7 +50,7 @@
 owner=nathans@sgi.com
 
 tmp=/tmp/$$
-here=`pwd`
+here=`pwd`; export here
 status=1       # failure is the default!
 
 # get standard environment, filters and checks
@@ -61,6 +61,7 @@ _cleanup()
 {
     echo "        *** umount"
     umount $SCRATCH_DEV >/dev/null 2>&1
+    rm -f $tmp.*
 }
 
 OUT="bench.out"
@@ -87,6 +88,16 @@ _fail()
     exit 1
 }
 
+bench_mkfs_xfs()
+{
+    mkfs_xfs -f $extra_mkfs_options $@
+}
+
+bench_mount_xfs()
+{
+    mount -t xfs $extra_mount_options $@
+}
+
 _run_benchmark()
 {
     pass=1
@@ -96,11 +107,11 @@ _run_benchmark()
     while [ $pass -le $passes -o $passes -lt 0 ]
     do
         _log "        *** clean scratch device [$bench starting, pass $pass]"
-        mkfs_xfs -f $SCRATCH_DEV 2>&1 |  _fix_malloc >>$FULL \
+        bench_mkfs_xfs  $SCRATCH_DEV 2>&1 | _fix_malloc >>$FULL \
                             || _fail "            !!! mkfs SCRATCH_DEV failed"
 
         _log "        *** mounting scratch device"
-        mount -t xfs $SCRATCH_DEV $SCRATCH_MNT \
+        bench_mount_xfs $SCRATCH_DEV $SCRATCH_MNT \
                             || _fail "            !!! failed to mount"
         
         _log "        *** mkdir"
@@ -110,12 +121,15 @@ _run_benchmark()
                             || _fail "            !!! couldn't chown benchdir"
 
         cd $SCRATCH_MNT/bench
-        seq=`perl -e 'printf "results.%s.%03d\n", '$bench, $pass`
+        seq=`perl -e 'printf "results.%s.%03d\n", '$bench', '$pass`
+        rm -f $seq $tmp.out
+
+        _log "        *** bench [$seq]"
+        $here/src/runas -u $uid -g $gid $here/run.$bench >$tmp.out 2>>$FULL
+       [ $? -eq 0 ]        || _fail "            !!! $bench pass $pass failed"
 
-        _log "        *** bench [src/runas -u $uid -g $gid run.$bench]"
-        $here/src/runas -u $uid -g $gid $here/run.$bench \
-                            | _fix_malloc | tee $seq | _logp
         cd $here
+        _fix_malloc < $tmp.out > $seq
 
         _log "        *** unmounting scratch device"
         umount $SCRATCH_DEV 2>&1 | _logp \
@@ -130,9 +144,11 @@ _run_benchmark()
 
 _merge_results()
 {
-    echo Results for $bench benchmark >>$OUT
-    echo results.$bench.* | sort -u | xargs cat >>$OUT
-    echo >>$OUT
+    echo Results for $bench benchmark
+    headers=`$here/run.$bench -h`
+    echo "[$headers]"
+    echo results.$bench.* | sort -nu | xargs cat
+    echo
 }
 
 # real QA test starts here
@@ -145,27 +161,47 @@ fi
 passes=$1
 user=$2
 group=$3
+shift; shift; shift
 
-benches=`echo run.* | sed -e 's/run\.//g'`
-[ $# -gt 3 ] && benches=$4
+if [ $# -gt 0 ]; then
+       benches="$@"
+else
+       benches=`echo run.* | sed -e 's/run\.//g'`
+fi
 [ -z "$benches" -o "$benches" = "*" ] && _fail "no benchmark scripts found"
 
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _require_scratch
+rm -f bench.* results.*
+
+if [ ! -z "$SCRATCH_LOGDEV" -a ! -z "$USE_SCRATCH_LOGDEV" ]
+then
+       extra_log_options="-l $SCRATCH_LOGDEV"
+       extra_mkfs_options="-llogdev=$SCRATCH_LOGDEV"
+       extra_mount_options="-ologdev=$SCRATCH_LOGDEV"
+fi
+
+# $OUT is the report which will ultimately be sent, keep it tidy.
+cat >$OUT <<EOF
+bench: MKFS_OPTIONS=$MKFS_OPTIONS $extra_mkfs_options
+bench: MOUNT_OPTIONS=$MOUNT_OPTIONS $extra_mount_options
+
+EOF
 
-rm -f bench.*
 for bench in $benches
-do 
+do
     echo "" >$FULL
     echo "" >$LOG
-    _log "*** benchmark started (passes=$passes, benchmark=$bench)"
-    _log "***     (`date`)"
+    _log "*** benchmark started [passes=$passes, benchmark=$bench]"
+    _log "*** (`date`)"
+    _log "*** MKFS_OPTIONS=$MKFS_OPTIONS"
+    _log "*** MOUNT_OPTIONS=$MOUNT_OPTIONS"
     _log "        *** unmounting scratch device"
     umount $SCRATCH_DEV 2>&1 | _fix_malloc >>$FULL
 
     _run_benchmark | _fix_malloc
-    _merge_results
+    _merge_results >>$OUT
 
     _log "*** done $bench"
 done