From: fsgqa <fsgqa>
Date: Sat, 9 Nov 2002 20:13:42 +0000 (+0000)
Subject: Fix up stderr handling in bench runs.
X-Git-Tag: v1.1.0~1035
X-Git-Url: http://git.apps.os.sepia.ceph.com/?p=xfstests-dev.git;a=commitdiff_plain;h=4e06cacd29fe3ed23674254d2a4b70aec1343410

Fix up stderr handling in bench runs.
Send stderr to the  $FULL file, not inline with stdout.
---

diff --git a/bench b/bench
index 532e2023..31308c41 100755
--- a/bench
+++ b/bench
@@ -114,7 +114,7 @@ _run_benchmark()
         rm -f $seq $tmp.out
 
         _log "        *** bench [$seq]"
-        $here/src/runas -u $uid -g $gid $here/run.$bench > $tmp.out
+        $here/src/runas -u $uid -g $gid $here/run.$bench >$tmp.out 2>>$FULL
 	[ $? -eq 0 ]        || _fail "            !!! $bench pass $pass failed"
 
         cd $here
diff --git a/common.bonnie b/common.bonnie
index c730e5ef..872870e9 100644
--- a/common.bonnie
+++ b/common.bonnie
@@ -12,7 +12,7 @@ run_bonnie()
 	rm -fr ./bonnie
 	[ $status -ne 0 ] && exit 1
 	filter_stdout < $tmp/bonnie.stdout
-	filter_stderr < $tmp/bonnie.stderr
+	filter_stderr < $tmp/bonnie.stderr 1>&2
 	rm -f $tmp/bonnie.stdout $tmp/bonnie.stderr
 	exit 0
 }
diff --git a/run.bonnie_ops b/run.bonnie_ops
index d059d2ab..6554c649 100755
--- a/run.bonnie_ops
+++ b/run.bonnie_ops
@@ -26,7 +26,7 @@ BONNIE_FILETYPE=${BONNIE_FILETYPE:=regular}
 # [ Note: the "files" can also be "^files:max" and possibly other things ]
 filter_stderr()
 {
-	sed -e 's/^..................../# /g' | awk '{ print } END { print "# }'
+	sed -e 's/^..................../# /g' | awk '{print} END {print "#"}'
 }
 
 #