Minor updates to qa/bench infrastructure.

ensure mkfs and mount parameters in use are echoed into the results file.

diff --git a/bench b/bench
index ec3e48680276141024ae9d9952809030ac8bed4d..228e13db285851e8ddf0b10f68a0ed2abc6b2bc8 100755 (executable)
--- a/bench
+++ b/bench
@@ -133,11 +133,11 @@ _run_benchmark()
 
 _merge_results()
 {
 
 _merge_results()
 {

-    echo Results for $bench benchmark >>$OUT
+    echo Results for $bench benchmark

     headers=`$here/run.$bench -h`
     headers=`$here/run.$bench -h`

-    echo "[$headers]" >>$OUT
-    echo results.$bench.* | sort -nu | xargs cat >>$OUT
-    echo >>$OUT
+    echo "[$headers]"
+    echo results.$bench.* | sort -nu | xargs cat
+    echo

 }
 
 # real QA test starts here
 }
 
 # real QA test starts here


@@ -162,12 +162,15 @@ fi
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _require_scratch
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _require_scratch

+rm -f bench.*

 
 

-echo "MKFS_OPTIONS=$MKFS_OPTIONS" >>$OUT
-echo "MOUNT_OPTIONS=$MOUNT_OPTIONS" >>$OUT
-echo "" >>$OUT
+# $OUT is the report which will ultimately be sent, keep it tidy.
+cat >$OUT <<EOF
+bench: MKFS_OPTIONS=$MKFS_OPTIONS
+bench: MOUNT_OPTIONS=$MOUNT_OPTIONS
+
+EOF

 
 

-rm -f bench.*

 for bench in $benches
 do
     echo "" >$FULL
 for bench in $benches
 do
     echo "" >$FULL


@@ -180,7 +183,7 @@ do
     umount $SCRATCH_DEV 2>&1 | _fix_malloc >>$FULL
 
     _run_benchmark | _fix_malloc
     umount $SCRATCH_DEV 2>&1 | _fix_malloc >>$FULL
 
     _run_benchmark | _fix_malloc

-    _merge_results
+    _merge_results >>$OUT

 
     _log "*** done $bench"
 done
 
     _log "*** done $bench"
 done

diff --git a/common.config b/common.config
index fccd9ac577b43e8b5fb81abdea9a4f291c944a7e..c2e7b19bd4587e8733080c2f4579a571f3aaa38a 100644 (file)
--- a/common.config
+++ b/common.config
@@ -68,11 +68,11 @@ export EXTRA=${EXTRA:=-xfs-qa}
 SOAK_PROC=3            # -p option to fsstress
 SOAK_STRESS=10000      # -n option to fsstress
 SOAK_PASSES=-1         # count of repetitions of fsstress (while soaking)
 SOAK_PROC=3            # -p option to fsstress
 SOAK_STRESS=10000      # -n option to fsstress
 SOAK_PASSES=-1         # count of repetitions of fsstress (while soaking)

-BENCH_PASSES=5         # count of repetitions of benchmarks (want averages)

 EMAIL=root@localhost   # where auto-qa will send its status messages
 export MKFS_OPTIONS=${MKFS_OPTIONS:=-bsize=4096}
 export MOUNT_OPTIONS=${MOUNT_OPTIONS:=-ologbufs=2}
 export MALLOCLIB=${MALLOCLIB:=/usr/lib/libefence.a}
 EMAIL=root@localhost   # where auto-qa will send its status messages
 export MKFS_OPTIONS=${MKFS_OPTIONS:=-bsize=4096}
 export MOUNT_OPTIONS=${MOUNT_OPTIONS:=-ologbufs=2}
 export MALLOCLIB=${MALLOCLIB:=/usr/lib/libefence.a}

+export BENCH_PASSES=${BENCH_PASSES:=5}

 
 case "$HOST"
 in
 
 case "$HOST"
 in