- Make use of geom_subr.sh to improve regression tests.

- Keep class-specific data in conf.sh file.

11 files changed, 55 insertions, 54 deletions

diff --git a/tools/regression/geom_mirror/conf.sh b/tools/regression/geom_mirror/conf.sh
new file mode 100644
index 000000000000..8a60a16360ee
--- /dev/null
+++ b/tools/regression/geom_mirror/conf.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+# $FreeBSD$
+
+name="test"
+class="mirror"
+base=`basename $0`
+
+. `dirname $0`/../geom_subr.sh
diff --git a/tools/regression/geom_mirror/test-1.t b/tools/regression/geom_mirror/test-1.t
index 67f01fe524b9..b07a8d1cb1de 100644
--- a/tools/regression/geom_mirror/test-1.t
+++ b/tools/regression/geom_mirror/test-1.t
@@ -1,22 +1,20 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-base=`basename $0`
+. `dirname $0`/conf.sh
+
+echo "1..1"
+
 us0=45
 us1=`expr $us0 + 1`
 us2=`expr $us0 + 2`
 
-echo "1..1"
-
 mdconfig -a -t malloc -s 1M -u $us0 || exit 1
 mdconfig -a -t malloc -s 2M -u $us1 || exit 1
 mdconfig -a -t malloc -s 3M -u $us2 || exit 1
 
-kldstat -q -m g_mirror || gmirror load || exit 1
-
 gmirror label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
-sleep 1
+devwait
 
 # Size of created device should be 1MB - 512b.
 
diff --git a/tools/regression/geom_mirror/test-2.t b/tools/regression/geom_mirror/test-2.t
index b39746ee1530..3fb08224caf7 100644
--- a/tools/regression/geom_mirror/test-2.t
+++ b/tools/regression/geom_mirror/test-2.t
@@ -1,8 +1,10 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-base=`basename $0`
+. `dirname $0`/conf.sh
+
+echo "1..4"
+
 balance="round-robin"
 us0=45
 us1=`expr $us0 + 1`
@@ -13,18 +15,14 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp /tmp/$base.XXXXXX` || exit 1
 dst=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..4"
-
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
 
-kldstat -q -m g_mirror || gmirror load || exit 1
-
 gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
-sleep 1
+devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
diff --git a/tools/regression/geom_mirror/test-3.t b/tools/regression/geom_mirror/test-3.t
index 197ec8d6b113..5bdd2ab354b8 100644
--- a/tools/regression/geom_mirror/test-3.t
+++ b/tools/regression/geom_mirror/test-3.t
@@ -1,8 +1,10 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-base=`basename $0`
+. `dirname $0`/conf.sh
+
+echo "1..5"
+
 balance="round-robin"
 us0=45
 us1=`expr $us0 + 1`
@@ -13,18 +15,14 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp /tmp/$base.XXXXXX` || exit 1
 dst=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..5"
-
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
 
-kldstat -q -m g_mirror || gmirror load || exit 1
-
 gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
-sleep 1
+devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
diff --git a/tools/regression/geom_mirror/test-4.t b/tools/regression/geom_mirror/test-4.t
index c75a2de12b99..0786bdb1fadb 100644
--- a/tools/regression/geom_mirror/test-4.t
+++ b/tools/regression/geom_mirror/test-4.t
@@ -1,8 +1,10 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-base=`basename $0`
+. `dirname $0`/conf.sh
+
+echo "1..5"
+
 balance="load"
 us0=45
 us1=`expr $us0 + 1`
@@ -13,18 +15,14 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp /tmp/$base.XXXXXX` || exit 1
 dst=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..5"
-
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
 
-kldstat -q -m g_mirror || gmirror load || exit 1
-
 gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
-sleep 1
+devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
diff --git a/tools/regression/geom_mirror/test-5.t b/tools/regression/geom_mirror/test-5.t
index 74a8d8aa5b23..5b0a5ed9f23f 100644
--- a/tools/regression/geom_mirror/test-5.t
+++ b/tools/regression/geom_mirror/test-5.t
@@ -1,8 +1,10 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-base=`basename $0`
+. `dirname $0`/conf.sh
+
+echo "1..5"
+
 balance="split"
 us0=45
 us1=`expr $us0 + 1`
@@ -13,18 +15,14 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp /tmp/$base.XXXXXX` || exit 1
 dst=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..5"
-
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
 
-kldstat -q -m g_mirror || gmirror load || exit 1
-
 gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
-sleep 1
+devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
diff --git a/tools/regression/geom_mirror/test-6.t b/tools/regression/geom_mirror/test-6.t
index b4d505db81b5..ec86d06f79e2 100644
--- a/tools/regression/geom_mirror/test-6.t
+++ b/tools/regression/geom_mirror/test-6.t
@@ -1,8 +1,10 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-base=`basename $0`
+. `dirname $0`/conf.sh
+
+echo "1..2"
+
 balance="split"
 us0=45
 us1=`expr $us0 + 1`
@@ -13,18 +15,14 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp /tmp/$base.XXXXXX` || exit 1
 dst=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..2"
-
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
 
-kldstat -q -m g_mirror || gmirror load || exit 1
-
 gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/md${us0} /dev/md${us1} || exit 1
-sleep 1
+devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 dd if=/dev/zero of=/dev/md${us2} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
diff --git a/tools/regression/geom_mirror/test-7.t b/tools/regression/geom_mirror/test-7.t
index 495f97c00f71..c911c03c3df1 100644
--- a/tools/regression/geom_mirror/test-7.t
+++ b/tools/regression/geom_mirror/test-7.t
@@ -1,8 +1,10 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-base=`basename $0`
+. `dirname $0`/conf.sh
+
+echo "1..5"
+
 balance="prefer"
 us0=45
 us1=`expr $us0 + 1`
@@ -13,18 +15,14 @@ nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)`
 src=`mktemp /tmp/$base.XXXXXX` || exit 1
 dst=`mktemp /tmp/$base.XXXXXX` || exit 1
 
-echo "1..5"
-
 dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us0 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us1 || exit 1
 mdconfig -a -t malloc -s `expr $nblocks1 + 1` -u $us2 || exit 1
 
-kldstat -q -m g_mirror || gmirror load || exit 1
-
 gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1
-sleep 1
+devwait
 
 dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1
 
diff --git a/tools/regression/geom_nop/conf.sh b/tools/regression/geom_nop/conf.sh
new file mode 100644
index 000000000000..0dc979713c1d
--- /dev/null
+++ b/tools/regression/geom_nop/conf.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+# $FreeBSD$
+
+class="nop"
+base=`basename $0`
+
+. `dirname $0`/../geom_subr.sh
diff --git a/tools/regression/geom_nop/test-1.t b/tools/regression/geom_nop/test-1.t
index a89e689354b0..f08f71da8bce 100644
--- a/tools/regression/geom_nop/test-1.t
+++ b/tools/regression/geom_nop/test-1.t
@@ -1,12 +1,12 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-base=`basename $0`
-us=45
+. `dirname $0`/conf.sh
 
 echo "1..1"
 
+us=45
+
 mdconfig -a -t malloc -s 1M -u $us || exit 1
 
 gnop create /dev/md${us} || exit 1
diff --git a/tools/regression/geom_nop/test-2.t b/tools/regression/geom_nop/test-2.t
index f173953bb0d9..e0ddb17abf86 100644
--- a/tools/regression/geom_nop/test-2.t
+++ b/tools/regression/geom_nop/test-2.t
@@ -1,8 +1,8 @@
 #!/bin/sh
 # $FreeBSD$
 
-name="test"
-base=`basename $0`
+. `dirname $0`/conf.sh
+
 us=45
 src=`mktemp /tmp/$base.XXXXXX` || exit 1
 dst=`mktemp /tmp/$base.XXXXXX` || exit 1