more bonnie++ customizations

git-svn-id: svn://svn.berlios.de/open-iscsi@333 d7303112-9cec-0310-bdd2-e83a94d6c2b6

2 files changed, 23 insertions, 6 deletions

diff --git a/test/README b/test/README
index 6eb699b..295b96f 100644
--- a/test/README
+++ b/test/README
@@ -3,5 +3,13 @@ This directory contains regression suite.
 I would appreciate if developer will run it at least once after
 modifications done before commit or mailing list submit.
 
+./regression.sh script expects next binaries and data files exists
+in current directory:
+
+	- regression.dat
+	- iscsiadm
+	- bonnie++ (source: http://www.open-iscsi.org/bits/bonnie++.tar.gz)
+	- disktest (source: http://www.open-iscsi.org/bits/disktest.tar.gz)
+
 Thanks!
 Dmitry
diff --git a/test/regression.sh b/test/regression.sh
index a07f4cd..58730fa 100755
--- a/test/regression.sh
+++ b/test/regression.sh
@@ -58,6 +58,7 @@ function update_cfg() {
 function disktest_run() {
 	bsizes="512 1024 2048 4096 8192 16384 32768 65536 131072 1000000"
 	test x$bsize != x && bsizes=$bsize
+	test x$bsize = xbonnie && return 0;
 	for bs in $bsizes; do
 		echo -n "disktest -T2 -K8 -B$bs -r -ID $device: "
 		if ! disktest -T2 -K8 -B$bs -r -ID $device >/dev/null; then
@@ -75,7 +76,7 @@ function disktest_run() {
 	return 0;
 }
 
-function mkfs_run() {
+function fdisk_run() {
 	echo "fdisk $device: "
 	if ! echo "
 p
@@ -92,6 +93,10 @@ q
 		return 1;
 	fi
 	echo "PASSED"
+	return 0;
+}
+
+function mkfs_run() {
 	echo -n "mke2fs $device: "
 	if ! mke2fs $device"1" 2>/dev/null >/dev/null; then
 		echo "FAILED"
@@ -102,7 +107,8 @@ q
 }
 
 function bonnie_run() {
-	dir="/tmp/iscsi.regression"
+	dir="/tmp/iscsi.bonnie.regression"
+	bonnie_dir=`pwd`
 	umount $dir 2>/dev/null >/dev/null
 	rm -rf $dir; mkdir $dir
 	echo -n "mount $dir: "
@@ -111,14 +117,16 @@ function bonnie_run() {
 		return 1;
 	fi
 	echo "PASSED"
-	echo -n "cd $dir; bonnie++ -r16 -s32 -uroot -f"
+	echo -n "bonnie++ -r0 -n10:0:0 -s16 -uroot -f -q: "
 	pushd $dir >/dev/null
-	if ! bonnie++ -r16 -s32 -uroot -f >/dev/null; then
-		popd $dir >/dev/null
+	if ! $bonnie_dir/bonnie++ -r0 -n10:0:0 -s16 -uroot -f -q 2>/dev/null >/dev/null; then
+		popd >/dev/null
+		umount $dir 2>/dev/null >/dev/null
 		echo "FAILED"
 		return 1;
 	fi
-	popd $dir >/dev/null
+	popd >/dev/null
+	umount $dir 2>/dev/null >/dev/null
 	echo "PASSED"
 	return 0;
 }
@@ -202,6 +210,7 @@ cat regression.dat | while read line; do
 	echo "max_recv_dlength = $max_recv_dlength"
 	echo "max_r2t = $max_r2t"
 	if ! disktest_run; then break; fi
+	if ! fdisk_run; then break; fi
 	if ! mkfs_run; then break; fi
 	if ! bonnie_run; then break; fi
 	let i=i+1