summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2008-03-20 11:25:28 -0500
committerMike Christie <michaelc@cs.wisc.edu>2008-03-20 11:25:28 -0500
commit78522565ba5bf8b3689124837a764e0b5c06b97c (patch)
tree73ff7656d856ab53f63a1f3c57e3fc8f456d4095 /test
parentd8060001c26cc5d8206525900cb1ef6a8a2e9da2 (diff)
downloadopen-iscsi-78522565ba5bf8b3689124837a764e0b5c06b97c.tar.gz
fix mkfs regression test
This starting of the mkfs regression test. To run do regression.sh -f /dev/sdb
Diffstat (limited to 'test')
-rwxr-xr-xtest/regression.sh26
1 files changed, 16 insertions, 10 deletions
diff --git a/test/regression.sh b/test/regression.sh
index 5b535f7..25d4a28 100755
--- a/test/regression.sh
+++ b/test/regression.sh
@@ -133,7 +133,7 @@ function bonnie_run() {
function fatal() {
echo "regression.sh: $1"
- echo "Usage: regression.sh <targetname|-f> <ipnumber#> <device> [test#[:#]] [bsize]"
+ echo "Usage: regression.sh [-f | <targetname> <ipnumber#> ] <device> [test#[:#]] [bsize]"
exit 1
}
@@ -147,18 +147,19 @@ test ! -e ${datfile} && fatal "can not find regression.dat"
test ! -e ${disktest} && fatal "can not find disktest"
test ! -e ${iscsiadm} && fatal "can not find iscsiadm"
test ! -e ${bonnie} && fatal "can not find bonnie++"
-test x$1 = x && fatal "target name parameter error"
-test x$2 = x && fatal "ipnumber parameter error"
-test x$3 = x && fatal "SCSI device parameter error"
if test x$1 = "x-f" -o x$1 = "x--format"; then
- mkfs_run
- exit
-fi
+ test x$2 = x && fatal "SCSI device parameter error"
+ device=$2
+else
+ test x$1 = x && fatal "target name parameter error"
+ test x$2 = x && fatal "ipnumber parameter error"
+ test x$3 = x && fatal "SCSI device parameter error"
-target="$1"
-ipnr="$2"
-device=$3
+ target="$1"
+ ipnr="$2"
+ device=$3
+fi
device_dir="$(dirname ${device})"
device_partition=''
@@ -172,6 +173,11 @@ case "${device_dir}" in
/dev/iscsi/*) device_partition="${device}-part1" ;;
esac
+if test x$1 = "x-f" -o x$1 = "x--format"; then
+ mkfs_run
+ exit
+fi
+
if [ -z "${device_partition}" ]; then
echo 'Unable to find device name for first partition.' >&2
exit 1