From: fsgqa <fsgqa>
Date: Sun, 10 Nov 2002 23:32:19 +0000 (+0000)
Subject: Minor QA/bench updates.
X-Git-Tag: v1.1.0~1033
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7bcfc05766e732fb61bb12c294bfb386ca66953c;p=users%2Fhch%2Fxfstests-dev.git

Minor QA/bench updates.
echo mkfs & mount options into the output.
---

diff --git a/bench b/bench
index 31308c41a..7cf0ecf7e 100755
--- a/bench
+++ b/bench
@@ -159,19 +159,19 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _require_scratch
 
-cat >$OUT <<-EOF
-	MKFS_OPTIONS=$MKFS_OPTIONS
-	MOUNT_OPTIONS=$MOUNT_OPTIONS
-
-EOF
+echo "MKFS_OPTIONS=$MKFS_OPTIONS" >>$OUT
+echo "MOUNT_OPTIONS=$MOUNT_OPTIONS" >>$OUT
+echo "" >>$OUT
 
 rm -f bench.*
 for bench in $benches
-do 
+do
     echo "" >$FULL
     echo "" >$LOG
     _log "*** benchmark started [passes=$passes, benchmark=$bench]"
     _log "*** (`date`)"
+    _log "*** MKFS_OPTIONS=$MKFS_OPTIONS"
+    _log "*** MOUNT_OPTIONS=$MOUNT_OPTIONS
     _log "        *** unmounting scratch device"
     umount $SCRATCH_DEV 2>&1 | _fix_malloc >>$FULL
 
diff --git a/common.config b/common.config
index 3bd79ae86..cfb0f5d4a 100644
--- a/common.config
+++ b/common.config
@@ -79,11 +79,12 @@ in
     bruce)
 	MODULAR=0
 	EMAIL="nathans@larry"
-        TEST_DEV=/dev/sda10
-	TEST_DIR=/mnt/xfs1
-	SCRATCH_DEV=/dev/sda9
 	SCRATCH_MNT=/mnt/xfs0
+	SCRATCH_DEV=/dev/sdb5
+	SCRATCH_RTDEV=/dev/sda9
 	SCRATCH_LOGDEV=/dev/sda11
+	TEST_DIR=/mnt/xfs1
+        TEST_DEV=/dev/sda10
 	TAPE_DEV=/dev/st0
 	RMT_TAPE_DEV=bruce:/dev/st0
 	RMT_IRIXTAPE_DEV=snort:/dev/tape
diff --git a/run.bonnie_io b/run.bonnie_io
index 4c7b75566..fb08396d5 100755
--- a/run.bonnie_io
+++ b/run.bonnie_io
@@ -5,7 +5,7 @@
 # then massages the output into CSV format with the human-readable
 # output preceding it as a "comment" (ie. #-prefixed).
 # 
-BONNIE_FILESIZE=${BONNIE_FILESIZE:=80M}
+BONNIE_FILESIZE=${BONNIE_FILESIZE:=500M}
 BONNIE_CHUNKSIZE=${BONNIE_CHUNKSIZE:=1K}
 
 . $here/common.bonnie