From 42e886a1011ac4a4bfa2930fc6f17d7e2b7d5d39 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Fri, 20 Sep 2002 01:35:55 +0000
Subject: [PATCH] Additional refinements of auto-bench stuff. Fix up producing
 the results files.

---
 bench         | 15 +++++++++------
 tools/auto-qa |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bench b/bench
index 252600ed..5c066c74 100755
--- a/bench
+++ b/bench
@@ -110,12 +110,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
+	[ $? -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 | tee $seq | _logp
 
         _log "        *** unmounting scratch device"
         umount $SCRATCH_DEV 2>&1 | _logp \
@@ -159,8 +162,8 @@ for bench in $benches
 do 
     echo "" >$FULL
     echo "" >$LOG
-    _log "*** benchmark started (passes=$passes, benchmark=$bench)"
-    _log "***     (`date`)"
+    _log "*** benchmark started [passes=$passes, benchmark=$bench]"
+    _log "*** (`date`)"
     _log "        *** unmounting scratch device"
     umount $SCRATCH_DEV 2>&1 | _fix_malloc >>$FULL
 
diff --git a/tools/auto-qa b/tools/auto-qa
index 487660b6..aec89afb 100755
--- a/tools/auto-qa
+++ b/tools/auto-qa
@@ -492,7 +492,7 @@ do
 
 	    _log ""
 	    _log "	    *** send results mail"
-	    mail -s "XFS QA benchmark results" $EMAIL < $ROOT/bench.out 2>&1
+	    mail -s "XFS QA benchmark results" $EMAIL < $QADIR/bench.out 2>&1
 	
 	    new_state="done"
 	    ;;