Add bonnie to the mix, and allow not running parts of the test (this should

automatically detect whether bonnie and dbench are installed and complain
verbosely if not.

diff --git a/lustre/tests/acceptance-small.sh b/lustre/tests/acceptance-small.sh
index 6a3a2a9..6ba9864 100755 (executable)
--- a/lustre/tests/acceptance-small.sh
+++ b/lustre/tests/acceptance-small.sh
@@ -2,20 +2,27 @@
 # script which _must_ complete successfully (at minimum) before checkins to
 # the CVS HEAD are allowed.
 set -vxe
-sh local.sh
-sh runtests --reformat local.xml
 
-sh lov.sh
-sh runtests --reformat lov.xml
+if [ "$RUNTESTS" != "no" ]; then
+       sh local.sh
+       sh runtests --reformat local.xml
+
+       sh lov.sh
+       sh runtests --reformat lov.xml
+fi
 
 export NAME=local
 sh llmount.sh
-sh sanity
-sh rundbench 1
+[ "$SANITY" != "no" ] && sh sanity.sh
+[ "$DBENCH" != "no" ]  && sh rundbench 1
+[ "$BONNIE" != "no" ] && bonnie++ -s 0 -n 10 -u 0 -d /mnt/lustre
+sync; sync
 sh llmountcleanup.sh
 
 export NAME=lov
 llmount.sh
-sh sanity
-sh rundbench 1
+[ "$SANITY" != "no" ] && sh sanity.sh
+[ "$DBENCH" != "no" ] && sh rundbench 1
+[ "$BONNIE" != "no" ] && bonnie++ -s 0 -n 10 -u 0 -d /mnt/lustre
+sync; sync
 sh llmountcleanup.sh