Fixed bench marking of other filesystems.

Added error message if bonnie++ is not installed.

diff --git a/common.bonnie b/common.bonnie
index 7414c0f0cb8e46de5cbcf76d294bed1fca2a1163..ffdb146c101c40ecf37c268b260ec64c7998c87d 100644 (file)
--- a/common.bonnie
+++ b/common.bonnie
@@ -1,5 +1,11 @@
 ##/bin/sh
 
+#check bonnie is installed
+if [ "`whereis bonnie++`" == "bonnie++:"]; then
+        echo $0 error bonnie not installed.
+        exit
+fi
+
 run_bonnie()
 {
        # dir, no hostname, quiet, fast (no per-char), ram (no sz checks)

diff --git a/common.dbench b/common.dbench
index f4d7d151458a64e0b031e211fad152e8cc196f1d..eec6262f20a33c5ec241740bea00c1e0623f3642 100755 (executable)
--- a/common.dbench
+++ b/common.dbench
@@ -1,5 +1,11 @@
 ##/bin/sh
 
+#check dbench is installed
+if [ "`whereis dbench`" == "dbench:"]; then
+        echo $0 error dbench not installed.
+        exit
+fi
+
 _run_dbench()
 {
        mkdir ./dbench || exit 1

diff --git a/common.rc b/common.rc
index 28b316a5cb37d23fd372d9fcb722fedbd0ad8e97..13401c3259103f71ad9a4028fd3d479bd1a88f2d 100644 (file)
--- a/common.rc
+++ b/common.rc
@@ -1,5 +1,4 @@
 ##/bin/sh
-
 #
 # Copyright (c) 2000-2003 Silicon Graphics, Inc.  All Rights Reserved.
 # 
@@ -187,9 +186,18 @@ _scratch_mkfs()
     nfs*)
        # do nothing for nfs
        ;;
-    udf|*)
+    udf*)
         $MKFS_PROG -t $FSTYP $MKFS_OPTIONS $* > /dev/null
        ;;
+    ext2)
+       mkfs.ext2 $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
+       ;;
+    ext3)
+       mkfs.ext3 $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
+       ;;
+    reiserfs)
+       mkfs.reiserfs $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
+       ;;
     esac
 }
 
@@ -520,7 +528,7 @@ _require_scratch()
                     _notrun "this test requires a valid \$SCRATCH_DEV"
                 fi
                 ;;
-       nfs*)
+       nfs*|ext2|ext3|reiserfs)
                 echo $SCRATCH_DEV | grep -q ":" > /dev/null 2>&1
                 if [ ! -z "$SCRATCH_DEV" -a ! -b "$SCRATCH_DEV" -a "$?" != "0" ]
                 then