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

[xfstests-dev.git] / run.tar

diff --git a/run.tar b/run.tar
index a5f42bbbb4993a578c2019217800379638e71afc..b6f455b8a9140517dfade238995fc5f7e4515ec0 100755 (executable)
--- a/run.tar
+++ b/run.tar
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh
 # 
 # Produces a .tar file (if one doesn't exist as $TARFILE), then
 # times how long it takes to untar it onto the current directory.
@@ -23,14 +23,17 @@ run_tar()
 {
        # %U=user %S=system %E=elapsed
        mkdir ./tar || exit 1
-       cd tar
-       /usr/bin/time -f '%U,%S,%E' tar xf $TARFILE || exit 1
+       size=`ls -lh $TARFILE | awk '{print $5}'`
+       time=`/usr/bin/time -f '%U,%S,%E' tar xf $TARFILE 2>&1`
+       status=$?
        cd ..
-       rm -fr ./tar || exit 1
+       rm -fr ./tar
+       [ $status -eq 0 ] || exit 1
+       echo "$size,$time"
 }
 
 if [ $# -gt 0 ]; then
-       echo "user,system,elapsed"
+       echo "sz,usr,sys,real"
        exit 0
 fi
 new_tar