Small updates to dbench test runs, and integrate some bonnie++ runs too.

[xfstests-dev.git] / run.dbench

diff --git a/run.dbench b/run.dbench
index c0f2dd3ca2ddb9b4b4cc2ae563cec102ae5f68d5..78be9c927f0f936ff0bed3975c985db328e836a7 100755 (executable)
--- a/run.dbench
+++ b/run.dbench
@@ -1,24 +1,10 @@
 #!/bin/sh
 # 
-# Does a dbench run (10 clients if $DBENCH_CLIENTS is not set),
-# then massages the output into CSV format.
+# Does a single-client dbench run
 # 
-DBENCH_CLIENTS=${DBENCH_CLIENTS:=10}
+DBENCH_CLIENTS=1
+export DBENCH_CLIENTS
 
-run_dbench()
-{
-       mkdir ./dbench || exit 1
-       dbench $DBENCH_CLIENTS || exit 1
-       rm -fr ./dbench || exit 1
-}
-
-# dbench gives:
-# "Throughput 40.6701 MB/sec (NB=50.8376 MB/sec  406.701 MBit/sec)"
-# 
-if [ $# -gt 0 ]; then
-       echo "clients,MB/sec"
-       exit 0
-fi
-run_dbench | perl -ne \
-       'if (m/^Throughput (\S+) /) { print '$DBENCH_CLIENTS',",",$1,"\n"; }'
+[ ! -d "$here" ] && here=`pwd`
 
+exec $here/common.dbench $@