diff options
185 files changed, 1489 insertions, 1523 deletions
@@ -112,7 +112,7 @@ .else TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ - check-old check-old-dirs check-old-files check-old-libs \ + check check-old check-old-dirs check-old-files check-old-libs \ checkdpadd clean cleandepend cleandir cleanworld \ delete-old delete-old-dirs delete-old-files delete-old-libs \ depend distribute distributekernel distributekernel.debug \ @@ -121,7 +121,7 @@ TGTS= all all-man buildenv buildenvvars buildkernel buildworld \ installkernel.debug packagekernel packageworld \ reinstallkernel reinstallkernel.debug \ installworld kernel-toolchain libraries lint maninstall \ - obj objlink regress rerelease showconfig tags toolchain update \ + obj objlink rerelease showconfig tags toolchain update \ _worldtmp _legacy _bootstrap-tools _cleanobj _obj \ _build-tools _cross-tools _includes _libraries _depend \ build32 builddtb distribute32 install32 xdev xdev-build xdev-install \ diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 0f4f264..7887ee4 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -340,6 +340,42 @@ .. devd .. + geom + class + concat + .. + eli + .. + gate + .. + gpt + .. + mirror + .. + nop + .. + raid3 + .. + shsec + .. + stripe + .. + uzip + etalon + .. + .. + .. + core + ConfCmp + .. + Data + .. + MdLoad + .. + Ref + .. + .. + .. growfs .. ifconfig diff --git a/sbin/geom/class/Makefile b/sbin/geom/class/Makefile index a7ed1b9..8ea22ff 100644 --- a/sbin/geom/class/Makefile +++ b/sbin/geom/class/Makefile @@ -21,4 +21,8 @@ SUBDIR+=shsec SUBDIR+=stripe SUBDIR+=virstor +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.subdir.mk> diff --git a/sbin/geom/class/tests/Makefile b/sbin/geom/class/tests/Makefile new file mode 100644 index 0000000..6213996 --- /dev/null +++ b/sbin/geom/class/tests/Makefile @@ -0,0 +1,19 @@ +# $FreeBSD$ + +TESTS_SUBDIRS+= concat +TESTS_SUBDIRS+= eli +TESTS_SUBDIRS+= gate +# XXX: might not work due to geom(4) changes; more investigation's needed +#TESTS_SUBDIRS+= gpt +TESTS_SUBDIRS+= mirror +TESTS_SUBDIRS+= nop +TESTS_SUBDIRS+= raid3 +TESTS_SUBDIRS+= shsec +TESTS_SUBDIRS+= stripe +TESTS_SUBDIRS+= uzip + +BINDIR= ${TESTSBASE}/sbin/geom/class + +FILES+= geom_subr.sh + +.include <bsd.test.mk> diff --git a/sbin/geom/class/tests/Makefile.inc b/sbin/geom/class/tests/Makefile.inc new file mode 100644 index 0000000..522da0b --- /dev/null +++ b/sbin/geom/class/tests/Makefile.inc @@ -0,0 +1,3 @@ +GEOM_CLASS= ${.CURDIR:T} + +TESTSDIR= ${TESTSBASE}/sbin/geom/class/${GEOM_CLASS} diff --git a/sbin/geom/class/tests/concat/1_test.sh b/sbin/geom/class/tests/concat/1_test.sh new file mode 100755 index 0000000..ef80a61 --- /dev/null +++ b/sbin/geom/class/tests/concat/1_test.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +echo '1..1' + +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 + +gconcat create $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 +devwait + +# Size of created device should be 1MB + 2MB + 3MB. + +size=`diskinfo /dev/concat/${name} | awk '{print $3}'` + +if [ $size -eq 6291456 ]; then + echo "ok - Size is 6291456" +else + echo "not ok - Size is 6291456" +fi diff --git a/tools/regression/geom_concat/test-2.t b/sbin/geom/class/tests/concat/2_test.sh index 445d9bc..95636be 100644..100755 --- a/tools/regression/geom_concat/test-2.t +++ b/sbin/geom/class/tests/concat/2_test.sh @@ -5,18 +5,17 @@ echo '1..1' -us=45 tsize=6 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 +dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 -gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 +gconcat create $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait dd if=${src} of=/dev/concat/${name} bs=1m count=$tsize >/dev/null 2>&1 @@ -28,8 +27,4 @@ else echo "ok - md5 checksum comparison" fi -gconcat destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` rm -f ${src} ${dst} diff --git a/sbin/geom/class/tests/concat/Makefile b/sbin/geom/class/tests/concat/Makefile new file mode 100644 index 0000000..81a4e99 --- /dev/null +++ b/sbin/geom/class/tests/concat/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +TAP_TESTS_SH+= 1_test +TAP_TESTS_SH+= 2_test + +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + +.include <bsd.test.mk> diff --git a/sbin/geom/class/tests/concat/conf.sh b/sbin/geom/class/tests/concat/conf.sh new file mode 100755 index 0000000..374ed12 --- /dev/null +++ b/sbin/geom/class/tests/concat/conf.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# $FreeBSD$ + +name="$(mktemp -u concat.XXXXXX)" +class="concat" +base=`basename $0` + +gconcat_test_cleanup() +{ + [ -c /dev/$class/$name ] && gconcat destroy $name + geom_test_cleanup +} +trap gconcat_test_cleanup ABRT EXIT INT TERM + +. `dirname $0`/../geom_subr.sh diff --git a/sbin/geom/class/tests/eli/Makefile b/sbin/geom/class/tests/eli/Makefile new file mode 100644 index 0000000..1846ed6 --- /dev/null +++ b/sbin/geom/class/tests/eli/Makefile @@ -0,0 +1,36 @@ +# $FreeBSD$ + +TAP_TESTS_SH+= attach_d_test +TAP_TESTS_SH+= configure_b_B_test +TAP_TESTS_SH+= delkey_test +TAP_TESTS_SH+= detach_l_test +TAP_TESTS_SH+= init_B_test +TAP_TESTS_SH+= init_J_test +TAP_TESTS_SH+= init_a_test +TAP_TESTS_SH+= init_i_P_test +TAP_TESTS_SH+= init_test +TAP_TESTS_SH+= integrity_copy_test +TAP_TESTS_SH+= integrity_data_test +TAP_TESTS_SH+= integrity_hmac_test +TAP_TESTS_SH+= kill_test +TAP_TESTS_SH+= nokey_test +TAP_TESTS_SH+= onetime_a_test +TAP_TESTS_SH+= onetime_d_test +TAP_TESTS_SH+= onetime_test +TAP_TESTS_SH+= readonly_test +TAP_TESTS_SH+= resize_test +TAP_TESTS_SH+= setkey_test + +TEST_METADATA.init_a_test+= timeout="1200" +TEST_METADATA.init_test+= timeout="300" +TEST_METADATA.integrity_copy_test+= timeout="1200" +TEST_METADATA.integrity_data_test+= timeout="600" +TEST_METADATA.integrity_hmac_test+= timeout="600" +TEST_METADATA.onetime_a_test+= timeout="600" +TEST_METADATA.onetime_test+= timeout="600" + +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + +.include <bsd.test.mk> diff --git a/tools/regression/geom_eli/attach-d.t b/sbin/geom/class/tests/eli/attach_d_test.sh index 4c4789e..5d700b3 100644..100755 --- a/tools/regression/geom_eli/attach-d.t +++ b/sbin/geom/class/tests/eli/attach_d_test.sh @@ -1,10 +1,11 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 echo "1..3" @@ -34,5 +35,4 @@ else echo "not ok 3" fi -mdconfig -d -u $no rm -f $keyfile diff --git a/sbin/geom/class/tests/eli/conf.sh b/sbin/geom/class/tests/eli/conf.sh new file mode 100755 index 0000000..080fa61 --- /dev/null +++ b/sbin/geom/class/tests/eli/conf.sh @@ -0,0 +1,19 @@ +#!/bin/sh +# $FreeBSD$ + +class="eli" +base=`basename $0` + +no=0 +while [ -c /dev/md$no ]; do + : $(( no += 1 )) +done + +geli_test_cleanup() +{ + [ -c /dev/md${no}.eli ] && geli detach md${no}.eli + mdconfig -d -u $no +} +trap geli_test_cleanup ABRT EXIT INT TERM + +. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_eli/configure-b-B.t b/sbin/geom/class/tests/eli/configure_b_B_test.sh index 23aa412..b6cdf4f 100644..100755 --- a/tools/regression/geom_eli/configure-b-B.t +++ b/sbin/geom/class/tests/eli/configure_b_B_test.sh @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -126,5 +127,3 @@ if [ $? -eq 0 ]; then else echo "not ok 17" fi - -mdconfig -d -u $no diff --git a/tools/regression/geom_eli/delkey.t b/sbin/geom/class/tests/eli/delkey_test.sh index a828622..67b253e 100644..100755 --- a/tools/regression/geom_eli/delkey.t +++ b/sbin/geom/class/tests/eli/delkey_test.sh @@ -1,13 +1,14 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile3=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile4=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile1=`mktemp $base.XXXXXX` || exit 1 +keyfile2=`mktemp $base.XXXXXX` || exit 1 +keyfile3=`mktemp $base.XXXXXX` || exit 1 +keyfile4=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 echo "1..14" @@ -136,5 +137,4 @@ else echo "not ok 14" fi -mdconfig -d -u $no rm -f $keyfile1 $keyfile2 $keyfile3 $keyfile4 diff --git a/tools/regression/geom_eli/detach-l.t b/sbin/geom/class/tests/eli/detach_l_test.sh index dfa3269..605ae94 100644..100755 --- a/tools/regression/geom_eli/detach-l.t +++ b/sbin/geom/class/tests/eli/detach_l_test.sh @@ -1,10 +1,11 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 echo "1..4" @@ -40,5 +41,4 @@ else echo "not ok 4" fi -mdconfig -d -u $no rm -f $keyfile diff --git a/tools/regression/geom_eli/init-B.t b/sbin/geom/class/tests/eli/init_B_test.sh index 36ab873..3ba743c 100644..100755 --- a/tools/regression/geom_eli/init-B.t +++ b/sbin/geom/class/tests/eli/init_B_test.sh @@ -1,11 +1,12 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -backupfile=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 +backupfile=`mktemp $base.XXXXXX` || exit 1 echo "1..13" @@ -99,8 +100,5 @@ if [ -c /dev/md${no}.eli ]; then else echo "not ok 13 - -B file" fi -geli detach md${no} -rm -f $backupfile -mdconfig -d -u $no -rm -f $keyfile +rm -f $backupfile $keyfile diff --git a/tools/regression/geom_eli/init-J.t b/sbin/geom/class/tests/eli/init_J_test.sh index 6f2862f..266a3d5 100644..100755 --- a/tools/regression/geom_eli/init-J.t +++ b/sbin/geom/class/tests/eli/init_J_test.sh @@ -1,13 +1,14 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile0=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 -passfile0=`mktemp /tmp/$base.XXXXXX` || exit 1 -passfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile0=`mktemp $base.XXXXXX` || exit 1 +keyfile1=`mktemp $base.XXXXXX` || exit 1 +passfile0=`mktemp $base.XXXXXX` || exit 1 +passfile1=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 echo "1..150" @@ -122,5 +123,4 @@ for iter in -1 0 64; do echo "ok ${i}"; i=$((i+1)) done -mdconfig -d -u $no rm -f ${keyfile0} ${keyfile1} ${passfile0} ${passfile1} diff --git a/tools/regression/geom_eli/init-a.t b/sbin/geom/class/tests/eli/init_a_test.sh index 87612a2..dbb24fe 100644..100755 --- a/tools/regression/geom_eli/init-a.t +++ b/sbin/geom/class/tests/eli/init_a_test.sh @@ -1,10 +1,11 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 echo "1..1380" @@ -26,7 +27,7 @@ for cipher in aes:0 aes:128 aes:256 \ keylen=${cipher##*:} for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do for secsize in 512 1024 2048 4096 8192; do - rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 + rnd=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1 dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 diff --git a/tools/regression/geom_eli/init-i-P.t b/sbin/geom/class/tests/eli/init_i_P_test.sh index a06f9f8..1c59a97 100644..100755 --- a/tools/regression/geom_eli/init-i-P.t +++ b/sbin/geom/class/tests/eli/init_i_P_test.sh @@ -1,10 +1,11 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 echo "1..1" @@ -18,5 +19,4 @@ else echo "not ok 1" fi -mdconfig -d -u $no rm -f $keyfile diff --git a/tools/regression/geom_eli/init.t b/sbin/geom/class/tests/eli/init_test.sh index 6934443..71dd6e2 100644..100755 --- a/tools/regression/geom_eli/init.t +++ b/sbin/geom/class/tests/eli/init_test.sh @@ -1,10 +1,11 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 echo "1..460" @@ -25,7 +26,7 @@ for cipher in aes:0 aes:128 aes:256 \ ealgo=${cipher%%:*} keylen=${cipher##*:} for secsize in 512 1024 2048 4096 8192; do - rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 + rnd=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1 dd if=/dev/random of=${keyfile} bs=512 count=16 >/dev/null 2>&1 diff --git a/tools/regression/geom_eli/integrity-copy.t b/sbin/geom/class/tests/eli/integrity_copy_test.sh index b52730a..4c8efd3 100644..100755 --- a/tools/regression/geom_eli/integrity-copy.t +++ b/sbin/geom/class/tests/eli/integrity_copy_test.sh @@ -1,11 +1,12 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -sector=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 +sector=`mktemp $base.XXXXXX` || exit 1 echo "1..5520" diff --git a/tools/regression/geom_eli/integrity-data.t b/sbin/geom/class/tests/eli/integrity_data_test.sh index 6975466..7ea7c96b 100644..100755 --- a/tools/regression/geom_eli/integrity-data.t +++ b/sbin/geom/class/tests/eli/integrity_data_test.sh @@ -1,11 +1,12 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -sector=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 +sector=`mktemp $base.XXXXXX` || exit 1 echo "1..2760" diff --git a/tools/regression/geom_eli/integrity-hmac.t b/sbin/geom/class/tests/eli/integrity_hmac_test.sh index 33f6029..243eac9 100644..100755 --- a/tools/regression/geom_eli/integrity-hmac.t +++ b/sbin/geom/class/tests/eli/integrity_hmac_test.sh @@ -1,11 +1,12 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 -sector=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 +sector=`mktemp $base.XXXXXX` || exit 1 echo "1..2760" diff --git a/tools/regression/geom_eli/kill.t b/sbin/geom/class/tests/eli/kill_test.sh index 5c315f3..ccced9f 100644..100755 --- a/tools/regression/geom_eli/kill.t +++ b/sbin/geom/class/tests/eli/kill_test.sh @@ -1,11 +1,12 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile1=`mktemp $base.XXXXXX` || exit 1 +keyfile2=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 echo "1..9" @@ -93,5 +94,4 @@ else echo "not ok 9" fi -mdconfig -d -u $no rm -f $keyfile1 $keyfile2 diff --git a/tools/regression/geom_eli/nokey.t b/sbin/geom/class/tests/eli/nokey_test.sh index 19ef680..f32e1a4 100644..100755 --- a/tools/regression/geom_eli/nokey.t +++ b/sbin/geom/class/tests/eli/nokey_test.sh @@ -1,10 +1,11 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 echo "1..8" @@ -61,5 +62,4 @@ else echo "not ok 8" fi -mdconfig -d -u $no rm -f $keyfile diff --git a/tools/regression/geom_eli/onetime-a.t b/sbin/geom/class/tests/eli/onetime_a_test.sh index ab19301..4e26dfb 100644..100755 --- a/tools/regression/geom_eli/onetime-a.t +++ b/sbin/geom/class/tests/eli/onetime_a_test.sh @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 echo "1..1380" @@ -25,7 +26,7 @@ for cipher in aes:0 aes:128 aes:256 \ keylen=${cipher##*:} for aalgo in hmac/md5 hmac/sha1 hmac/ripemd160 hmac/sha256 hmac/sha384 hmac/sha512; do for secsize in 512 1024 2048 4096 8192; do - rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 + rnd=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $secsize \* $sectors + 512`b -u $no || exit 1 geli onetime -a $aalgo -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null diff --git a/tools/regression/geom_eli/onetime-d.t b/sbin/geom/class/tests/eli/onetime_d_test.sh index d49cb64..51a6abb 100644..100755 --- a/tools/regression/geom_eli/onetime-d.t +++ b/sbin/geom/class/tests/eli/onetime_d_test.sh @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 mdconfig -a -t malloc -s $sectors -u $no || exit 1 diff --git a/tools/regression/geom_eli/onetime.t b/sbin/geom/class/tests/eli/onetime_test.sh index 3a7d67e..17061d0 100644..100755 --- a/tools/regression/geom_eli/onetime.t +++ b/sbin/geom/class/tests/eli/onetime_test.sh @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 echo "1..460" @@ -24,7 +25,7 @@ for cipher in aes:0 aes:128 aes:256 \ ealgo=${cipher%%:*} keylen=${cipher##*:} for secsize in 512 1024 2048 4096 8192; do - rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 + rnd=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $secsize \* $sectors`b -u $no || exit 1 geli onetime -e $ealgo -l $keylen -s $secsize md${no} 2>/dev/null diff --git a/tools/regression/geom_eli/readonly.t b/sbin/geom/class/tests/eli/readonly_test.sh index 210a364..721ad62 100644..100755 --- a/tools/regression/geom_eli/readonly.t +++ b/sbin/geom/class/tests/eli/readonly_test.sh @@ -1,10 +1,11 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -keyfile=`mktemp /tmp/$base.XXXXXX` || exit 1 +keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 echo "1..11" diff --git a/tools/regression/geom_eli/resize.t b/sbin/geom/class/tests/eli/resize_test.sh index 86ee364..67d6291 100644..100755 --- a/tools/regression/geom_eli/resize.t +++ b/sbin/geom/class/tests/eli/resize_test.sh @@ -1,7 +1,8 @@ -#! /bin/sh -# +#!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + echo 1..27 BLK=512 @@ -22,8 +23,6 @@ setsize() { # Initialise -kldload geom_eli >/dev/null 2>&1 - setsize 10 40 || echo -n "not " echo ok $i - "Sized ${md}a to 10m" i=$((i + 1)) @@ -145,6 +144,5 @@ echo ok $i - "Attached ${md}p1.eli" i=$((i + 1)) geli detach ${md}p1.eli -mdconfig -du$unit rm tmp.* diff --git a/tools/regression/geom_eli/setkey.t b/sbin/geom/class/tests/eli/setkey_test.sh index 611471a..458100c 100644..100755 --- a/tools/regression/geom_eli/setkey.t +++ b/sbin/geom/class/tests/eli/setkey_test.sh @@ -1,15 +1,16 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 -rnd=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile1=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile2=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile3=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile4=`mktemp /tmp/$base.XXXXXX` || exit 1 -keyfile5=`mktemp /tmp/$base.XXXXXX` || exit 1 +rnd=`mktemp $base.XXXXXX` || exit 1 +keyfile1=`mktemp $base.XXXXXX` || exit 1 +keyfile2=`mktemp $base.XXXXXX` || exit 1 +keyfile3=`mktemp $base.XXXXXX` || exit 1 +keyfile4=`mktemp $base.XXXXXX` || exit 1 +keyfile5=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 echo "1..16" @@ -152,5 +153,4 @@ else echo "not ok 16" fi -mdconfig -d -u $no rm -f $keyfile1 $keyfile2 $keyfile3 $keyfile4 $keyfile5 diff --git a/sbin/geom/class/tests/gate/1_test.sh b/sbin/geom/class/tests/gate/1_test.sh new file mode 100755 index 0000000..fb6fd62 --- /dev/null +++ b/sbin/geom/class/tests/gate/1_test.sh @@ -0,0 +1,61 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +base=`basename $0` +us=0 +while [ -c /dev/ggate${us} ]; do + : $(( us += 1 )) +done +conf=`mktemp $base.XXXXXX` || exit 1 +pidfile=ggated.pid +port=33080 + +work=$(attach_md -t malloc -s 1M) +src=$(attach_md -t malloc -s 1M) + +test_cleanup() +{ + ggatec destroy -f -u $us + pkill -F $pidfile + geom_test_cleanup +} +trap test_cleanup ABRT EXIT INT TERM + +dd if=/dev/random of=/dev/$work bs=1m count=1 conv=sync +dd if=/dev/random of=/dev/$src bs=1m count=1 conv=sync +src_checksum=$(md5 -q /dev/$src) + +echo "127.0.0.1 RW /dev/$work" > $conf + +if ! ggated -F $pidfile -p $port $conf; then + echo 'ggated failed to start' + echo 'Bail out!' + exit 1 +fi +if ! ggatec create -p $port -u $us 127.0.0.1 /dev/$work; then + echo 'ggatec create failed' + echo 'Bail out!' + exit 1 +fi + +dd if=/dev/${src} of=/dev/ggate${us} bs=1m count=1 +sleep 1 + +echo '1..2' + +work_checksum=$(md5 -q /dev/$work) +if [ "$work_checksum" != "$src_checksum" ]; then + echo "not ok 1 - md5 checksums didn't match ($work_checksum != $src_checksum)" + echo "not ok 2 # SKIP" +else + echo 'ok 1 - md5 checksum' + + ggate_checksum=$(md5 -q /dev/ggate${us}) + if [ "$ggate_checksum" != "$src_checksum" ]; then + echo "not ok 2 - md5 checksums didn't match ($ggate_checksum != $src_checksum)" + else + echo 'ok 2 - md5 checksum' + fi +fi diff --git a/sbin/geom/class/tests/gate/2_test.sh b/sbin/geom/class/tests/gate/2_test.sh new file mode 100755 index 0000000..be89acc --- /dev/null +++ b/sbin/geom/class/tests/gate/2_test.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +base=`basename $0` +us=46 +work=`mktemp -u $base.XXXXXX` || exit 1 +src=`mktemp -u $base.XXXXXX` || exit 1 + +test_cleanup() +{ + ggatel destroy -f -u $us + rm -f $work $src + + geom_test_cleanup +} +trap test_cleanup ABRT EXIT INT TERM + +dd if=/dev/random of=$work bs=1m count=1 conv=sync +dd if=/dev/random of=$src bs=1m count=1 conv=sync + +if ! ggatel create -u $us $work; then + echo 'ggatel create failed' + echo 'Bail out!' + exit 1 +fi + +dd if=${src} of=/dev/ggate${us} bs=1m count=1 +sleep 1 + +echo '1..2' + +src_checksum=$(md5 -q $src) +work_checksum=$(md5 -q $work) +if [ "$work_checksum" != "$src_checksum" ]; then + echo "not ok 1 - md5 checksums didn't match ($work_checksum != $src_checksum) # TODO: bug 204616" + echo 'not ok 2 # SKIP' +else + echo 'ok 1 - md5 checksum' + + ggate_checksum=$(md5 -q /dev/ggate${us}) + if [ "$ggate_checksum" != "$src_checksum" ]; then + echo "not ok 2 - md5 checksums didn't match ($ggate_checksum != $src_checksum)" + else + echo 'ok 2 - md5 checksum' + fi +fi diff --git a/sbin/geom/class/tests/gate/3_test.sh b/sbin/geom/class/tests/gate/3_test.sh new file mode 100755 index 0000000..8901aca --- /dev/null +++ b/sbin/geom/class/tests/gate/3_test.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +base=`basename $0` +us=47 + +test_cleanup() +{ + ggatel destroy -f -u $us + + geom_test_cleanup +} +trap test_cleanup ABRT EXIT INT TERM + +work=$(attach_md -t malloc -s 1M) +src=$(attach_md -t malloc -s 1M) + +dd if=/dev/random of=/dev/$work bs=1m count=1 conv=sync +dd if=/dev/random of=/dev/$src bs=1m count=1 conv=sync +src_checksum=$(md5 -q /dev/$src) + +if ! ggatel create -u $us /dev/$work; then + echo 'ggatel create failed' + echo 'Bail out!' + exit 1 +fi + +dd if=/dev/${src} of=/dev/ggate${us} bs=1m count=1 conv=sync +sleep 1 + +echo '1..2' + +work_checksum=$(md5 -q /dev/$work) +if [ "$work_checksum" != "$src_checksum" ]; then + echo "not ok 1 - md5 checksums didn't match ($work_checksum != $src_checksum)" + echo 'not ok 2 # SKIP' +else + echo 'ok 1 - md5 checksum' + + ggate_checksum=$(md5 -q /dev/ggate${us}) + if [ "$ggate_checksum" != "$src_checksum" ]; then + echo "not ok 2 - md5 checksums didn't match ($ggate_checksum != $src_checksum)" + else + echo 'ok 2 - md5 checksum' + fi +fi diff --git a/sbin/geom/class/tests/gate/Makefile b/sbin/geom/class/tests/gate/Makefile new file mode 100644 index 0000000..985d98f --- /dev/null +++ b/sbin/geom/class/tests/gate/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +TAP_TESTS_SH+= 1_test +TAP_TESTS_SH+= 2_test +TAP_TESTS_SH+= 3_test + +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + +.include <bsd.test.mk> diff --git a/sbin/geom/class/tests/gate/conf.sh b/sbin/geom/class/tests/gate/conf.sh new file mode 100755 index 0000000..4eede08 --- /dev/null +++ b/sbin/geom/class/tests/gate/conf.sh @@ -0,0 +1,10 @@ +#!/bin/sh +# $FreeBSD$ + +name="$(mktemp -u gate.XXXXXX)" +class="gate" +base=`basename $0` + +kldstat -q -m g_${class} || kldload geom_${class} || exit 1 + +. `dirname $0`/../geom_subr.sh diff --git a/sbin/geom/class/tests/geom_subr.sh b/sbin/geom/class/tests/geom_subr.sh new file mode 100644 index 0000000..a039377 --- /dev/null +++ b/sbin/geom/class/tests/geom_subr.sh @@ -0,0 +1,48 @@ +#!/bin/sh +# $FreeBSD$ + +if [ $(id -u) -ne 0 ]; then + echo 'Tests must be run as root' + echo 'Bail out!' + exit 1 +fi +kldstat -q -m g_${class} || g${class} load || exit 1 + +devwait() +{ + while :; do + if [ -c /dev/${class}/${name} ]; then + return + fi + sleep 0.2 + done +} + +# Need to keep track of the test md devices to avoid the scenario where a test +# failing will cause the other tests to bomb out, or a test failing will leave +# a large number of md(4) devices lingering around +: ${TMPDIR=/tmp} +export TMPDIR +TEST_MDS_FILE=${TMPDIR}/test_mds + +attach_md() +{ + local test_md + + test_md=$(mdconfig -a "$@") || exit + echo $test_md >> $TEST_MDS_FILE || exit + echo $test_md +} + +geom_test_cleanup() +{ + local test_md + + if [ -f $TEST_MDS_FILE ]; then + while read test_md; do + # The "#" tells the TAP parser this is a comment + echo "# Removing test memory disk: $test_md" + mdconfig -d -u $test_md + done < $TEST_MDS_FILE + fi +} diff --git a/sbin/geom/class/tests/gpt/Makefile b/sbin/geom/class/tests/gpt/Makefile new file mode 100644 index 0000000..be11f0a --- /dev/null +++ b/sbin/geom/class/tests/gpt/Makefile @@ -0,0 +1,13 @@ +# $FreeBSD$ + +BINDIR= ${TESTSDIR} + +TAP_TESTS_PERL+= gctl_test + +PROGS+= gctl +MAN= + +DPADD.gctl+= ${LIBGEOM} +LDADD.gctl+= -lgeom + +.include <bsd.test.mk> diff --git a/tools/regression/geom_gpt/test.c b/sbin/geom/class/tests/gpt/gctl.c index d750d30..136a616 100644 --- a/tools/regression/geom_gpt/test.c +++ b/sbin/geom/class/tests/gpt/gctl.c @@ -29,13 +29,14 @@ __FBSDID("$FreeBSD$"); #include <sys/param.h> #include <errno.h> -#include <libgeom.h> #include <limits.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <unistd.h> +#include <libgeom.h> + struct retval { struct retval *retval; const char *param; diff --git a/tools/regression/geom_gpt/gctl.t b/sbin/geom/class/tests/gpt/gctl_test.pl index f99e6d8..0f30805 100644..100755 --- a/tools/regression/geom_gpt/gctl.t +++ b/sbin/geom/class/tests/gpt/gctl_test.pl @@ -29,10 +29,12 @@ my $srcdir = `dirname $0`; chomp $srcdir; -my $cmd = "/tmp/gctl-$$"; +my $tmpdir = $ENV{TMPDIR} || "/tmp"; + +my $cmd = "$srcdir/gctl"; my $out = "$cmd.out"; -my $disk = "/tmp/disk-$$"; -my $mntpt = "/tmp/mount-$$"; +my $disk = "$tmpdir/disk-$$"; +my $mntpt = "$tmpdir/mount-$$"; my %steps = ( "000" => "gctl", @@ -131,13 +133,6 @@ if (exists $ENV{'TEST_VERBOSE'}) { $verbose = "-v"; } -# Compile the driver... -my $st = system("cc -o $cmd -g $srcdir/test.c -lgeom"); -if ($st != 0) { - print "1..0 # SKIP error compiling test.c\n"; - exit 0; -} - # Make sure we have permission to use gctl... if (`$cmd` =~ "^FAIL Permission denied") { print "1..0 # SKIP not enough permission\n"; diff --git a/sbin/geom/class/tests/mirror/1_test.sh b/sbin/geom/class/tests/mirror/1_test.sh new file mode 100755 index 0000000..af82a14 --- /dev/null +++ b/sbin/geom/class/tests/mirror/1_test.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +echo "1..1" + +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 + +gmirror label $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 +devwait + +# Size of created device should be 1MB - 512b. + +size=`diskinfo /dev/mirror/${name} | awk '{print $3}'` + +if [ $size -eq 1048064 ]; then + echo "ok 1" +else + echo "not ok 1" +fi diff --git a/tools/regression/geom_mirror/test-2.t b/sbin/geom/class/tests/mirror/2_test.sh index 3fb0822..5605c44 100644..100755 --- a/tools/regression/geom_mirror/test-2.t +++ b/sbin/geom/class/tests/mirror/2_test.sh @@ -6,22 +6,19 @@ echo "1..4" balance="round-robin" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 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 +us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -32,28 +29,24 @@ if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then else echo "ok 1" fi -dd if=/dev/md${us0} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +dd if=/dev/${us0} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 2" else echo "ok 2" fi -dd if=/dev/md${us1} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +dd if=/dev/${us1} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 3" else echo "ok 3" fi -dd if=/dev/md${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +dd if=/dev/${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 4" else echo "ok 4" fi -gmirror remove $name md${us0} md${us1} md${us2} -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/tools/regression/geom_mirror/test-3.t b/sbin/geom/class/tests/mirror/3_test.sh index 5bdd2ab..b7f8525 100644..100755 --- a/tools/regression/geom_mirror/test-3.t +++ b/sbin/geom/class/tests/mirror/3_test.sh @@ -6,22 +6,19 @@ echo "1..5" balance="round-robin" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 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 +us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -33,7 +30,7 @@ else echo "ok 1" fi -gmirror remove $name md${us0} +gmirror remove $name ${us0} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 2" @@ -41,7 +38,7 @@ else echo "ok 2" fi -gmirror remove $name md${us1} +gmirror remove $name ${us1} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 3" @@ -49,7 +46,7 @@ else echo "ok 3" fi -gmirror remove $name md${us2} +gmirror remove $name ${us2} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 4" @@ -64,7 +61,4 @@ else echo "ok 5" fi -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/tools/regression/geom_mirror/test-4.t b/sbin/geom/class/tests/mirror/4_test.sh index 0786bdb..6efcc02 100644..100755 --- a/tools/regression/geom_mirror/test-4.t +++ b/sbin/geom/class/tests/mirror/4_test.sh @@ -6,22 +6,19 @@ echo "1..5" balance="load" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 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 +us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -33,7 +30,7 @@ else echo "ok 1" fi -gmirror remove $name md${us0} +gmirror remove $name ${us0} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 2" @@ -41,7 +38,7 @@ else echo "ok 2" fi -gmirror remove $name md${us1} +gmirror remove $name ${us1} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 3" @@ -49,7 +46,7 @@ else echo "ok 3" fi -gmirror remove $name md${us2} +gmirror remove $name ${us2} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 4" @@ -57,6 +54,8 @@ else echo "ok 4" fi +gmirror destroy $name + # mirror/${name} should be removed. if [ -c /dev/${name} ]; then echo "not ok 5" @@ -64,7 +63,4 @@ else echo "ok 5" fi -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/tools/regression/geom_mirror/test-5.t b/sbin/geom/class/tests/mirror/5_test.sh index 5b0a5ed..3a176b5 100644..100755 --- a/tools/regression/geom_mirror/test-5.t +++ b/sbin/geom/class/tests/mirror/5_test.sh @@ -6,22 +6,19 @@ echo "1..5" balance="split" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=8192 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 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 +us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -33,7 +30,7 @@ else echo "ok 1" fi -gmirror remove $name md${us0} +gmirror remove $name ${us0} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 2" @@ -41,7 +38,7 @@ else echo "ok 2" fi -gmirror remove $name md${us1} +gmirror remove $name ${us1} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 3" @@ -49,7 +46,7 @@ else echo "ok 3" fi -gmirror remove $name md${us2} +gmirror remove $name ${us2} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 4" @@ -64,7 +61,4 @@ else echo "ok 5" fi -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/sbin/geom/class/tests/mirror/6_test.sh b/sbin/geom/class/tests/mirror/6_test.sh new file mode 100755 index 0000000..68036e9 --- /dev/null +++ b/sbin/geom/class/tests/mirror/6_test.sh @@ -0,0 +1,45 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +echo "1..2" + +balance="split" +ddbs=8192 +nblocks1=1024 +nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 + +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 + +us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 + +gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/${us0} /dev/${us1} || exit 1 +devwait + +dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us2} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 + +dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then + echo "not ok 1" +else + echo "ok 1" +fi + +# Connect disk to the mirror. +gmirror insert ${name} ${us2} +# Wait for synchronization. +sleep 1 +dd if=/dev/${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then + echo "not ok 2" +else + echo "ok 2" +fi + +rm -f ${src} ${dst} diff --git a/tools/regression/geom_mirror/test-7.t b/sbin/geom/class/tests/mirror/7_test.sh index c911c03..f5bf71a 100644..100755 --- a/tools/regression/geom_mirror/test-7.t +++ b/sbin/geom/class/tests/mirror/7_test.sh @@ -6,22 +6,19 @@ echo "1..5" balance="prefer" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 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 +us0=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us1=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 +us2=$(attach_md -t malloc -s `expr $nblocks1 + 1`) || exit 1 -gmirror label -b $balance $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +gmirror label -b $balance $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/mirror/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -33,7 +30,7 @@ else echo "ok 1" fi -gmirror remove $name md${us0} +gmirror remove $name ${us0} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 2" @@ -41,7 +38,7 @@ else echo "ok 2" fi -gmirror remove $name md${us1} +gmirror remove $name ${us1} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 3" @@ -49,7 +46,7 @@ else echo "ok 3" fi -gmirror remove $name md${us2} +gmirror remove $name ${us2} dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then echo "not ok 4" @@ -64,7 +61,4 @@ else echo "ok 5" fi -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/sbin/geom/class/tests/mirror/Makefile b/sbin/geom/class/tests/mirror/Makefile new file mode 100644 index 0000000..cf3784f --- /dev/null +++ b/sbin/geom/class/tests/mirror/Makefile @@ -0,0 +1,15 @@ +# $FreeBSD$ + +TAP_TESTS_SH+= 1_test +TAP_TESTS_SH+= 2_test +TAP_TESTS_SH+= 3_test +TAP_TESTS_SH+= 4_test +TAP_TESTS_SH+= 5_test +TAP_TESTS_SH+= 6_test +TAP_TESTS_SH+= 7_test + +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + +.include <bsd.test.mk> diff --git a/sbin/geom/class/tests/mirror/conf.sh b/sbin/geom/class/tests/mirror/conf.sh new file mode 100755 index 0000000..d8595f1 --- /dev/null +++ b/sbin/geom/class/tests/mirror/conf.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# $FreeBSD$ + +name="$(mktemp -u mirror.XXXXXX)" +class="mirror" +base=`basename $0` + +gmirror_test_cleanup() +{ + [ -c /dev/$class/$name ] && gmirror destroy $name + geom_test_cleanup +} +trap gmirror_test_cleanup ABRT EXIT INT TERM + +. `dirname $0`/../geom_subr.sh diff --git a/sbin/geom/class/tests/nop/1_test.sh b/sbin/geom/class/tests/nop/1_test.sh new file mode 100755 index 0000000..4d6b65d --- /dev/null +++ b/sbin/geom/class/tests/nop/1_test.sh @@ -0,0 +1,20 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +echo "1..1" + +us=$(attach_md -t malloc -s 1M) || exit 1 + +gnop create /dev/${us} || exit 1 + +# Size of created device should be 1MB. + +size=`diskinfo /dev/${us}.nop | awk '{print $3}'` + +if [ $size -eq 1048576 ]; then + echo "ok 1" +else + echo "not ok 1" +fi diff --git a/sbin/geom/class/tests/nop/2_test.sh b/sbin/geom/class/tests/nop/2_test.sh new file mode 100755 index 0000000..7422345 --- /dev/null +++ b/sbin/geom/class/tests/nop/2_test.sh @@ -0,0 +1,26 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 + +echo "1..1" + +dd if=/dev/random of=${src} bs=1m count=1 >/dev/null 2>&1 + +us=$(attach_md -t malloc -s 1M) || exit 1 + +gnop create /dev/${us} || exit 1 + +dd if=${src} of=/dev/${us}.nop bs=1m count=1 >/dev/null 2>&1 +dd if=/dev/${us}.nop of=${dst} bs=1m count=1 >/dev/null 2>&1 + +if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then + echo "not ok 1" +else + echo "ok 1" +fi + +rm -f ${src} ${dst} diff --git a/sbin/geom/class/tests/nop/Makefile b/sbin/geom/class/tests/nop/Makefile new file mode 100644 index 0000000..81a4e99 --- /dev/null +++ b/sbin/geom/class/tests/nop/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +TAP_TESTS_SH+= 1_test +TAP_TESTS_SH+= 2_test + +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + +.include <bsd.test.mk> diff --git a/sbin/geom/class/tests/nop/conf.sh b/sbin/geom/class/tests/nop/conf.sh new file mode 100755 index 0000000..e38e10c --- /dev/null +++ b/sbin/geom/class/tests/nop/conf.sh @@ -0,0 +1,14 @@ +#!/bin/sh +# $FreeBSD$ + +class="nop" +base=`basename $0` + +gnop_test_cleanup() +{ + [ -c /dev/${us}.nop ] && gnop destroy ${us}.nop + geom_test_cleanup +} +trap gnop_test_cleanup ABRT EXIT INT TERM + +. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_raid3/test-2.t b/sbin/geom/class/tests/raid3/10_test.sh index 88daf78..edd827d 100644..100755 --- a/tools/regression/geom_raid3/test-2.t +++ b/sbin/geom/class/tests/raid3/10_test.sh @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 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 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label -r $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -32,8 +29,4 @@ else echo "ok 1" fi -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/sbin/geom/class/tests/raid3/11_test.sh b/sbin/geom/class/tests/raid3/11_test.sh new file mode 100755 index 0000000..0407261 --- /dev/null +++ b/sbin/geom/class/tests/raid3/11_test.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +echo "1..1" + +ddbs=2048 +nblocks1=1024 +nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 + +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 + +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 + +graid3 label -w $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 +devwait + +dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 + +dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then + echo "not ok 1" +else + echo "ok 1" +fi + +rm -f ${src} ${dst} diff --git a/sbin/geom/class/tests/raid3/12_test.sh b/sbin/geom/class/tests/raid3/12_test.sh new file mode 100755 index 0000000..10533c6 --- /dev/null +++ b/sbin/geom/class/tests/raid3/12_test.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +echo "1..1" + +nblocks1=9 +nblocks2=`expr $nblocks1 - 1` +nblocks3=`expr $nblocks2 / 2` + +us0=$(attach_md -t malloc -s $nblocks1) || exit 1 +us1=$(attach_md -t malloc -s $nblocks1) || exit 1 +us2=$(attach_md -t malloc -s $nblocks1) || exit 1 + +dd if=/dev/random of=/dev/${us0} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/random of=/dev/${us1} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/random of=/dev/${us2} count=$nblocks1 >/dev/null 2>&1 + +graid3 label -w $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 +devwait +# Wait for synchronization. +sleep 2 +graid3 stop $name +# Break one component. +dd if=/dev/random of=/dev/${us1} count=$nblocks2 >/dev/null 2>&1 +# Provoke retaste of the rest components. +true > /dev/${us0} +true > /dev/${us2} +sleep 1 + +dd if=/dev/raid3/${name} of=/dev/null bs=1k count=$nblocks3 >/dev/null 2>&1 +ec=$? +if [ $ec -eq 0 ]; then + echo "not ok 1" +else + echo "ok 1" +fi diff --git a/tools/regression/geom_raid3/test-1.t b/sbin/geom/class/tests/raid3/1_test.sh index 9202967..4c0b4a2 100644..100755 --- a/tools/regression/geom_raid3/test-1.t +++ b/sbin/geom/class/tests/raid3/1_test.sh @@ -5,15 +5,11 @@ echo "1..2" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 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 - -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} 2>/dev/null || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} 2>/dev/null || exit 1 devwait # Size of created device should be 2MB - 1024B. @@ -30,8 +26,3 @@ if [ $sectorsize -eq 1024 ]; then else echo "not ok 2" fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 diff --git a/sbin/geom/class/tests/raid3/2_test.sh b/sbin/geom/class/tests/raid3/2_test.sh new file mode 100755 index 0000000..22ebd38 --- /dev/null +++ b/sbin/geom/class/tests/raid3/2_test.sh @@ -0,0 +1,32 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +echo "1..1" + +ddbs=2048 +nblocks1=1024 +nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 + +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 + +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 + +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 +devwait + +dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 + +dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then + echo "not ok 1" +else + echo "ok 1" +fi + +rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-3.t b/sbin/geom/class/tests/raid3/3_test.sh index d2c1a5f..f068b06 100644..100755 --- a/tools/regression/geom_raid3/test-3.t +++ b/sbin/geom/class/tests/raid3/3_test.sh @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 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 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -36,8 +33,4 @@ else echo "ok 1" fi -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-4.t b/sbin/geom/class/tests/raid3/4_test.sh index d437ec0..810f13d 100644..100755 --- a/tools/regression/geom_raid3/test-4.t +++ b/sbin/geom/class/tests/raid3/4_test.sh @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 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 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait # @@ -36,8 +33,4 @@ else echo "ok 1" fi -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-5.t b/sbin/geom/class/tests/raid3/5_test.sh index ffd85f6..7bc8d42 100644..100755 --- a/tools/regression/geom_raid3/test-5.t +++ b/sbin/geom/class/tests/raid3/5_test.sh @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 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 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait # @@ -36,8 +33,4 @@ else echo "ok 1" fi -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-6.t b/sbin/geom/class/tests/raid3/6_test.sh index 97b5503..20bf192 100644..100755 --- a/tools/regression/geom_raid3/test-6.t +++ b/sbin/geom/class/tests/raid3/6_test.sh @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 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 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -29,7 +26,7 @@ dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 # Rebuild of DATA component. # graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 graid3 insert -n 1 $name md${us1} sleep 1 @@ -40,8 +37,4 @@ else echo "ok 1" fi -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-7.t b/sbin/geom/class/tests/raid3/7_test.sh index 3d89873..23666f8 100644..100755 --- a/tools/regression/geom_raid3/test-7.t +++ b/sbin/geom/class/tests/raid3/7_test.sh @@ -5,22 +5,19 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 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 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 @@ -29,12 +26,12 @@ dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 # Rebuild of PARITY component. # graid3 remove -n 2 $name -dd if=/dev/zero of=/dev/md${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 graid3 insert -n 2 $name md${us2} sleep 1 # Remove DATA component, so PARITY component can be used while reading. graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then @@ -43,8 +40,4 @@ else echo "ok 1" fi -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-8.t b/sbin/geom/class/tests/raid3/8_test.sh index b9621f4..2eb9b1a 100644..100755 --- a/tools/regression/geom_raid3/test-8.t +++ b/sbin/geom/class/tests/raid3/8_test.sh @@ -5,29 +5,26 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 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 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait # # Writing without DATA component and rebuild of DATA component. # graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 graid3 insert -n 1 $name md${us1} sleep 1 @@ -39,8 +36,4 @@ else echo "ok 1" fi -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-9.t b/sbin/geom/class/tests/raid3/9_test.sh index 0695011..0ef010a 100644..100755 --- a/tools/regression/geom_raid3/test-9.t +++ b/sbin/geom/class/tests/raid3/9_test.sh @@ -5,35 +5,32 @@ echo "1..1" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` ddbs=2048 nblocks1=1024 nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 -dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 +us0=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us1=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 1 +us2=$(attach_md -t malloc -s $(expr $nblocks1 + 1)) || exit 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 +dd if=/dev/random of=${src} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -graid3 label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +graid3 label $name /dev/${us0} /dev/${us1} /dev/${us2} || exit 1 devwait # # Writing without PARITY component and rebuild of PARITY component. # graid3 remove -n 2 $name -dd if=/dev/zero of=/dev/md${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us2} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 graid3 insert -n 2 $name md${us2} sleep 1 # Remove DATA component, so PARITY component can be used while reading. graid3 remove -n 1 $name -dd if=/dev/zero of=/dev/md${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 +dd if=/dev/zero of=/dev/${us1} bs=512 count=`expr $nblocks1 + 1` >/dev/null 2>&1 dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then @@ -42,8 +39,4 @@ else echo "ok 1" fi -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/sbin/geom/class/tests/raid3/Makefile b/sbin/geom/class/tests/raid3/Makefile new file mode 100644 index 0000000..c1c95f1 --- /dev/null +++ b/sbin/geom/class/tests/raid3/Makefile @@ -0,0 +1,20 @@ +# $FreeBSD$ + +TAP_TESTS_SH+= 1_test +TAP_TESTS_SH+= 2_test +TAP_TESTS_SH+= 3_test +TAP_TESTS_SH+= 4_test +TAP_TESTS_SH+= 5_test +TAP_TESTS_SH+= 6_test +TAP_TESTS_SH+= 7_test +TAP_TESTS_SH+= 8_test +TAP_TESTS_SH+= 9_test +TAP_TESTS_SH+= 10_test +TAP_TESTS_SH+= 11_test +TAP_TESTS_SH+= 12_test + +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + +.include <bsd.test.mk> diff --git a/sbin/geom/class/tests/raid3/conf.sh b/sbin/geom/class/tests/raid3/conf.sh new file mode 100755 index 0000000..4f141df --- /dev/null +++ b/sbin/geom/class/tests/raid3/conf.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# $FreeBSD$ + +name="test" +class="raid3" +base=`basename $0` + +graid3_test_cleanup() +{ + [ -c /dev/$class/$name ] && graid3 stop $name + geom_test_cleanup +} +trap graid3_test_cleanup ABRT EXIT INT TERM + +. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_shsec/test-1.t b/sbin/geom/class/tests/shsec/1_test.sh index 5cb5b4f..ab0bb37 100644..100755 --- a/tools/regression/geom_shsec/test-1.t +++ b/sbin/geom/class/tests/shsec/1_test.sh @@ -5,15 +5,11 @@ echo "1..2" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 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 - -gshsec label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} 2>/dev/null || exit 1 +gshsec label $name /dev/${us0} /dev/${us1} /dev/${us2} 2>/dev/null || exit 1 devwait # Size of created device should be 1MB - 512B. @@ -30,8 +26,3 @@ if [ $sectorsize -eq 512 ]; then else echo "not ok 2" fi - -gshsec stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 diff --git a/tools/regression/geom_shsec/test-2.t b/sbin/geom/class/tests/shsec/2_test.sh index 19a4e0a..9dfe36a 100644..100755 --- a/tools/regression/geom_shsec/test-2.t +++ b/sbin/geom/class/tests/shsec/2_test.sh @@ -5,21 +5,18 @@ echo "1..4" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` nblocks1=1024 nblocks2=`expr $nblocks1 + 1` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 dd if=/dev/random of=${src} count=$nblocks1 >/dev/null 2>&1 -mdconfig -a -t malloc -s $nblocks2 -u $us0 || exit 1 -mdconfig -a -t malloc -s $nblocks2 -u $us1 || exit 1 -mdconfig -a -t malloc -s $nblocks2 -u $us2 || exit 1 +us0=$(attach_md -t malloc -s $nblocks2) || exit 1 +us1=$(attach_md -t malloc -s $nblocks2) || exit 1 +us2=$(attach_md -t malloc -s $nblocks2) || exit 1 -gshsec label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 +gshsec label $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait dd if=${src} of=/dev/shsec/${name} count=$nblocks1 >/dev/null 2>&1 @@ -31,29 +28,25 @@ else echo "ok 1" fi -dd if=/dev/md${us0} of=${dst} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/${us0} of=${dst} count=$nblocks1 >/dev/null 2>&1 if [ `md5 -q ${src}` = `md5 -q ${dst}` ]; then echo "not ok 2" else echo "ok 2" fi -dd if=/dev/md${us1} of=${dst} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/${us1} of=${dst} count=$nblocks1 >/dev/null 2>&1 if [ `md5 -q ${src}` = `md5 -q ${dst}` ]; then echo "not ok 3" else echo "ok 3" fi -dd if=/dev/md${us2} of=${dst} count=$nblocks1 >/dev/null 2>&1 +dd if=/dev/${us2} of=${dst} count=$nblocks1 >/dev/null 2>&1 if [ `md5 -q ${src}` = `md5 -q ${dst}` ]; then echo "not ok 4" else echo "ok 4" fi -gshsec stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 rm -f ${src} ${dst} diff --git a/sbin/geom/class/tests/shsec/Makefile b/sbin/geom/class/tests/shsec/Makefile new file mode 100644 index 0000000..81a4e99 --- /dev/null +++ b/sbin/geom/class/tests/shsec/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +TAP_TESTS_SH+= 1_test +TAP_TESTS_SH+= 2_test + +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + +.include <bsd.test.mk> diff --git a/sbin/geom/class/tests/shsec/conf.sh b/sbin/geom/class/tests/shsec/conf.sh new file mode 100755 index 0000000..7800eb7 --- /dev/null +++ b/sbin/geom/class/tests/shsec/conf.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# $FreeBSD$ + +name="$(mktemp -u shsec.XXXXXX)" +class="shsec" +base=`basename $0` + +shsec_test_cleanup() +{ + [ -c /dev/$class/$name ] && gshsec stop $name + geom_test_cleanup +} +trap shsec_test_cleanup ABRT EXIT INT TERM + +. `dirname $0`/../geom_subr.sh diff --git a/sbin/geom/class/tests/stripe/1_test.sh b/sbin/geom/class/tests/stripe/1_test.sh new file mode 100755 index 0000000..7923763 --- /dev/null +++ b/sbin/geom/class/tests/stripe/1_test.sh @@ -0,0 +1,23 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +echo "1..1" + +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 + +gstripe create -s 16384 $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 +devwait + +# Size of created device should be 1MB * 3. + +size=`diskinfo /dev/stripe/${name} | awk '{print $3}'` + +if [ $size -eq 3145728 ]; then + echo "ok 1" +else + echo "not ok 1" +fi diff --git a/sbin/geom/class/tests/stripe/2_test.sh b/sbin/geom/class/tests/stripe/2_test.sh new file mode 100755 index 0000000..f6e11f5 --- /dev/null +++ b/sbin/geom/class/tests/stripe/2_test.sh @@ -0,0 +1,30 @@ +#!/bin/sh +# $FreeBSD$ + +. `dirname $0`/conf.sh + +echo "1..1" + +tsize=3 +src=`mktemp $base.XXXXXX` || exit 1 +dst=`mktemp $base.XXXXXX` || exit 1 + +dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 + +us0=$(attach_md -t malloc -s 1M) || exit 1 +us1=$(attach_md -t malloc -s 2M) || exit 1 +us2=$(attach_md -t malloc -s 3M) || exit 1 + +gstripe create -s 8192 $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 +devwait + +dd if=${src} of=/dev/stripe/${name} bs=1m count=$tsize >/dev/null 2>&1 +dd if=/dev/stripe/${name} of=${dst} bs=1m count=$tsize >/dev/null 2>&1 + +if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then + echo "not ok 1" +else + echo "ok 1" +fi + +rm -f ${src} ${dst} diff --git a/sbin/geom/class/tests/stripe/Makefile b/sbin/geom/class/tests/stripe/Makefile new file mode 100644 index 0000000..81a4e99 --- /dev/null +++ b/sbin/geom/class/tests/stripe/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +TAP_TESTS_SH+= 1_test +TAP_TESTS_SH+= 2_test + +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + +.include <bsd.test.mk> diff --git a/sbin/geom/class/tests/stripe/conf.sh b/sbin/geom/class/tests/stripe/conf.sh new file mode 100755 index 0000000..fd0f41c --- /dev/null +++ b/sbin/geom/class/tests/stripe/conf.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# $FreeBSD$ + +name="$(mktemp -u stripe.XXXXXX)" +class="stripe" +base=`basename $0` + +gstripe_test_cleanup() +{ + [ -c /dev/$class/$name ] && gstripe destroy $name + geom_test_cleanup +} +trap gstripe_test_cleanup ABRT EXIT INT TERM + +. `dirname $0`/../geom_subr.sh diff --git a/sbin/geom/class/tests/uzip/1_test.sh b/sbin/geom/class/tests/uzip/1_test.sh new file mode 100755 index 0000000..222b6c9 --- /dev/null +++ b/sbin/geom/class/tests/uzip/1_test.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# $FreeBSD$ + +testsdir=$(dirname $0) +. $testsdir/conf.sh + +echo "1..1" + +UUE=$testsdir/1.img.uzip.uue +uudecode $UUE +us0=$(attach_md -f $(basename $UUE .uue)) || exit 1 +sleep 1 + +mount -o ro /dev/${us0}.uzip "${mntpoint}" || exit 1 + +#cat "${mntpoint}/etalon.txt" +diff -I '\$FreeBSD.*\$' -u $testsdir/etalon/etalon.txt "${mntpoint}/etalon.txt" +if [ $? -eq 0 ]; then + echo "ok 1" +else + echo "not ok 1" +fi diff --git a/sbin/geom/class/tests/uzip/Makefile b/sbin/geom/class/tests/uzip/Makefile new file mode 100644 index 0000000..b4e1d7d --- /dev/null +++ b/sbin/geom/class/tests/uzip/Makefile @@ -0,0 +1,36 @@ +# +# $FreeBSD$ +# +# Regression test for geom_uzip. +# + +IMAGE= 1.img +ZIMAGE= ${IMAGE}.uzip +UZIMAGE= ${ZIMAGE}.uue + +CLEANFILES+= ${IMAGE} ${UZIMAGE} ${ZIMAGE} + +${IMAGE}: + makefs -s 1048576 ${.TARGET} ${.CURDIR}/etalon + +${ZIMAGE}: ${IMAGE} + mkuzip -o ${.TARGET} ${.ALLSRC} + +${UZIMAGE}: ${IMAGE} ${ZIMAGE} + printf "#\n# $$" >${.TARGET} + printf "FreeBSD$$\n#\n\n" >> ${.TARGET} + uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET} + +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh + +FILES+= ${UZIMAGE} +FILESDIR= ${TESTSDIR} + +FILESGROUPS= FILES etalon +etalon+= etalon/etalon.txt +etalonDIR= ${TESTSDIR}/etalon + +TAP_TESTS_SH+= 1_test + +.include <bsd.test.mk> diff --git a/sbin/geom/class/tests/uzip/conf.sh b/sbin/geom/class/tests/uzip/conf.sh new file mode 100755 index 0000000..8a3b459 --- /dev/null +++ b/sbin/geom/class/tests/uzip/conf.sh @@ -0,0 +1,18 @@ +#!/bin/sh +# $FreeBSD$ + +class="uzip" +base=`basename $0` + +uzip_test_cleanup() +{ + umount $mntpoint + rmdir $mntpoint + geom_test_cleanup +} +trap uzip_test_cleanup ABRT EXIT INT TERM + +. `dirname $0`/../geom_subr.sh + +# NOTE: make sure $TMPDIR has been set by geom_subr.sh if unset [by kyua, etc] +mntpoint=$(mktemp -d tmp.XXXXXX) || exit diff --git a/tools/regression/geom_uzip/etalon/etalon.txt b/sbin/geom/class/tests/uzip/etalon/etalon.txt index cb8acf3..cb8acf3 100644 --- a/tools/regression/geom_uzip/etalon/etalon.txt +++ b/sbin/geom/class/tests/uzip/etalon/etalon.txt diff --git a/tools/regression/geom/ConfCmp/ConfCmp.c b/sbin/geom/core/tests/ConfCmp/ConfCmp.c index 599a953b..161b5cc 100644 --- a/tools/regression/geom/ConfCmp/ConfCmp.c +++ b/sbin/geom/core/tests/ConfCmp/ConfCmp.c @@ -190,7 +190,7 @@ dofile(char *filename) XML_SetCharacterDataHandler(parser, CharData); fd = open(filename, O_RDONLY); if (fd < 0) - err(1, filename); + err(1, "%s", filename); fstat(fd, &st); p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0); i = XML_Parse(parser, p, st.st_size, 1); @@ -217,6 +217,7 @@ print_node(struct node *np) printf("\n"); } +#if 0 static void print_tree(struct node *np, int n) { @@ -226,6 +227,7 @@ print_tree(struct node *np, int n) LIST_FOREACH(np1, &np->children, siblings) print_tree(np1, n + 2); } +#endif static void sort_node(struct node *np) diff --git a/sbin/geom/core/tests/ConfCmp/Makefile b/sbin/geom/core/tests/ConfCmp/Makefile new file mode 100644 index 0000000..ffd814e --- /dev/null +++ b/sbin/geom/core/tests/ConfCmp/Makefile @@ -0,0 +1,43 @@ +# $FreeBSD$ + +BINDIR= ${TESTSBASE}/sbin/geom/core/ConfCmp + +PROG= ConfCmp +SRCS+= ConfCmp.c +SRCS+= subr_sbuf.c + +.PATH: ${SRCTOP}/sys/kern + +# Uncomment for ElectricFence +#LDADD+= -lefence -L/usr/local/lib + +DPADD+= ${LIBBSDXML} +LDADD+= -lbsdxml + +LDFLAGS+= -static + +MAN= +CLEANFILES+= _* + +# XXX: this should be in a test script +check: .PHONY +check: ${PROG} + cd ${.CURDIR} && env PATH="$$PATH:${.OBJDIR}" ${MAKE} _check + +_check: .PHONY +_check: ${PROG} + rm -f _* *.core + cd ${.CURDIR}; ${PROG} a1.conf a1.conf + cd ${.CURDIR}; ${PROG} a1.conf a1a.conf + cd ${.CURDIR}; if ${PROG} a1.conf a1b.conf > /dev/null 2>&1 ; then exit 1 ; fi + cd ${.CURDIR}; if ${PROG} a1.conf a1c.conf > /dev/null 2>&1 ; then exit 1 ; fi + cd ${.CURDIR}; if ${PROG} a1.conf a1d.conf > /dev/null 2>&1 ; then exit 1 ; fi + cd ${.CURDIR}; ${PROG} a2.conf a2.conf + cd ${.CURDIR}; ${PROG} a2.conf a2a.conf + cd ${.CURDIR}; if ${PROG} a2.conf a2b.conf > /dev/null 2>&1 ; then exit 1 ; fi + cd ${.CURDIR}; if ${PROG} a2.conf a2c.conf > /dev/null 2>&1 ; then exit 1 ; fi + cd ${.CURDIR}; if ${PROG} a2.conf a2d.conf > /dev/null 2>&1 ; then exit 1 ; fi + +WARNS?= 5 + +.include <bsd.prog.mk> diff --git a/tools/regression/geom/ConfCmp/a1.conf b/sbin/geom/core/tests/ConfCmp/a1.conf index 94171cd..94171cd 100644 --- a/tools/regression/geom/ConfCmp/a1.conf +++ b/sbin/geom/core/tests/ConfCmp/a1.conf diff --git a/tools/regression/geom/ConfCmp/a1a.conf b/sbin/geom/core/tests/ConfCmp/a1a.conf index 01110f3..01110f3 100644 --- a/tools/regression/geom/ConfCmp/a1a.conf +++ b/sbin/geom/core/tests/ConfCmp/a1a.conf diff --git a/tools/regression/geom/ConfCmp/a1b.conf b/sbin/geom/core/tests/ConfCmp/a1b.conf index 46f423b..46f423b 100644 --- a/tools/regression/geom/ConfCmp/a1b.conf +++ b/sbin/geom/core/tests/ConfCmp/a1b.conf diff --git a/tools/regression/geom/ConfCmp/a1c.conf b/sbin/geom/core/tests/ConfCmp/a1c.conf index 1b5a2b9..1b5a2b9 100644 --- a/tools/regression/geom/ConfCmp/a1c.conf +++ b/sbin/geom/core/tests/ConfCmp/a1c.conf diff --git a/tools/regression/geom/ConfCmp/a1d.conf b/sbin/geom/core/tests/ConfCmp/a1d.conf index a9063c5..a9063c5 100644 --- a/tools/regression/geom/ConfCmp/a1d.conf +++ b/sbin/geom/core/tests/ConfCmp/a1d.conf diff --git a/tools/regression/geom/ConfCmp/a2.conf b/sbin/geom/core/tests/ConfCmp/a2.conf index 6688fd1..6688fd1 100644 --- a/tools/regression/geom/ConfCmp/a2.conf +++ b/sbin/geom/core/tests/ConfCmp/a2.conf diff --git a/tools/regression/geom/ConfCmp/a2a.conf b/sbin/geom/core/tests/ConfCmp/a2a.conf index 3d35fe9..3d35fe9 100644 --- a/tools/regression/geom/ConfCmp/a2a.conf +++ b/sbin/geom/core/tests/ConfCmp/a2a.conf diff --git a/tools/regression/geom/ConfCmp/a2b.conf b/sbin/geom/core/tests/ConfCmp/a2b.conf index 58c0e15..58c0e15 100644 --- a/tools/regression/geom/ConfCmp/a2b.conf +++ b/sbin/geom/core/tests/ConfCmp/a2b.conf diff --git a/tools/regression/geom/ConfCmp/a2c.conf b/sbin/geom/core/tests/ConfCmp/a2c.conf index 381c410..381c410 100644 --- a/tools/regression/geom/ConfCmp/a2c.conf +++ b/sbin/geom/core/tests/ConfCmp/a2c.conf diff --git a/tools/regression/geom/ConfCmp/a2d.conf b/sbin/geom/core/tests/ConfCmp/a2d.conf index bccaed5..bccaed5 100644 --- a/tools/regression/geom/ConfCmp/a2d.conf +++ b/sbin/geom/core/tests/ConfCmp/a2d.conf diff --git a/sbin/geom/core/tests/Data/Makefile b/sbin/geom/core/tests/Data/Makefile new file mode 100644 index 0000000..33d7aa6 --- /dev/null +++ b/sbin/geom/core/tests/Data/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +FILES+= disk.alpha.da0.xml +FILES+= disk.alpha2.da0.xml +FILES+= disk.apple.xml +FILES+= disk.beast.da0.xml +FILES+= disk.critter.ad0.xml +FILES+= disk.empty.flp.xml +FILES+= disk.far.ad0.xml +FILES+= disk.flat.da1.xml +FILES+= disk.kern.flp.xml +FILES+= disk.msdos.ext.xml +FILES+= disk.msdos.flp.xml +FILES+= disk.pc98.wdc0.xml +FILES+= disk.sun.da0.xml +FILES+= disk.sun.da1.xml +FILES+= disk.typo.ad0.xml + +FILESDIR= ${TESTSBASE}/sbin/geom/core/Data + +.include <bsd.prog.mk> diff --git a/tools/regression/geom/Data/disk.alpha.da0.xml b/sbin/geom/core/tests/Data/disk.alpha.da0.xml index 670fcc3..670fcc3 100644 --- a/tools/regression/geom/Data/disk.alpha.da0.xml +++ b/sbin/geom/core/tests/Data/disk.alpha.da0.xml diff --git a/tools/regression/geom/Data/disk.alpha2.da0.xml b/sbin/geom/core/tests/Data/disk.alpha2.da0.xml index 5b341b1..5b341b1 100644 --- a/tools/regression/geom/Data/disk.alpha2.da0.xml +++ b/sbin/geom/core/tests/Data/disk.alpha2.da0.xml diff --git a/tools/regression/geom/Data/disk.apple.xml b/sbin/geom/core/tests/Data/disk.apple.xml index ecdd523..ecdd523 100644 --- a/tools/regression/geom/Data/disk.apple.xml +++ b/sbin/geom/core/tests/Data/disk.apple.xml diff --git a/tools/regression/geom/Data/disk.beast.da0.xml b/sbin/geom/core/tests/Data/disk.beast.da0.xml index 96ad5f7..96ad5f7 100644 --- a/tools/regression/geom/Data/disk.beast.da0.xml +++ b/sbin/geom/core/tests/Data/disk.beast.da0.xml diff --git a/tools/regression/geom/Data/disk.critter.ad0.xml b/sbin/geom/core/tests/Data/disk.critter.ad0.xml index 9e93b24..9e93b24 100644 --- a/tools/regression/geom/Data/disk.critter.ad0.xml +++ b/sbin/geom/core/tests/Data/disk.critter.ad0.xml diff --git a/tools/regression/geom/Data/disk.empty.flp.xml b/sbin/geom/core/tests/Data/disk.empty.flp.xml index 88c603a..88c603a 100644 --- a/tools/regression/geom/Data/disk.empty.flp.xml +++ b/sbin/geom/core/tests/Data/disk.empty.flp.xml diff --git a/tools/regression/geom/Data/disk.far.ad0.xml b/sbin/geom/core/tests/Data/disk.far.ad0.xml index 0a8d3ca..0a8d3ca 100644 --- a/tools/regression/geom/Data/disk.far.ad0.xml +++ b/sbin/geom/core/tests/Data/disk.far.ad0.xml diff --git a/tools/regression/geom/Data/disk.flat.da1.xml b/sbin/geom/core/tests/Data/disk.flat.da1.xml index 2302a7c..2302a7c 100644 --- a/tools/regression/geom/Data/disk.flat.da1.xml +++ b/sbin/geom/core/tests/Data/disk.flat.da1.xml diff --git a/tools/regression/geom/Data/disk.kern.flp.xml b/sbin/geom/core/tests/Data/disk.kern.flp.xml index 6640c48..6640c48 100644 --- a/tools/regression/geom/Data/disk.kern.flp.xml +++ b/sbin/geom/core/tests/Data/disk.kern.flp.xml diff --git a/tools/regression/geom/Data/disk.msdos.ext.xml b/sbin/geom/core/tests/Data/disk.msdos.ext.xml index 868a88f7..868a88f7 100644 --- a/tools/regression/geom/Data/disk.msdos.ext.xml +++ b/sbin/geom/core/tests/Data/disk.msdos.ext.xml diff --git a/tools/regression/geom/Data/disk.msdos.flp.xml b/sbin/geom/core/tests/Data/disk.msdos.flp.xml index d057d1a..d057d1a 100644 --- a/tools/regression/geom/Data/disk.msdos.flp.xml +++ b/sbin/geom/core/tests/Data/disk.msdos.flp.xml diff --git a/tools/regression/geom/Data/disk.pc98.wdc0.xml b/sbin/geom/core/tests/Data/disk.pc98.wdc0.xml index 6bae97f..6bae97f 100644 --- a/tools/regression/geom/Data/disk.pc98.wdc0.xml +++ b/sbin/geom/core/tests/Data/disk.pc98.wdc0.xml diff --git a/tools/regression/geom/Data/disk.sun.da0.xml b/sbin/geom/core/tests/Data/disk.sun.da0.xml index 826581f..826581f 100644 --- a/tools/regression/geom/Data/disk.sun.da0.xml +++ b/sbin/geom/core/tests/Data/disk.sun.da0.xml diff --git a/tools/regression/geom/Data/disk.sun.da1.xml b/sbin/geom/core/tests/Data/disk.sun.da1.xml index 0aac8e5..0aac8e5 100644 --- a/tools/regression/geom/Data/disk.sun.da1.xml +++ b/sbin/geom/core/tests/Data/disk.sun.da1.xml diff --git a/tools/regression/geom/Data/disk.typo.ad0.xml b/sbin/geom/core/tests/Data/disk.typo.ad0.xml index 56383ab..56383ab 100644 --- a/tools/regression/geom/Data/disk.typo.ad0.xml +++ b/sbin/geom/core/tests/Data/disk.typo.ad0.xml diff --git a/sbin/geom/core/tests/Makefile b/sbin/geom/core/tests/Makefile new file mode 100644 index 0000000..eaaa997 --- /dev/null +++ b/sbin/geom/core/tests/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/sbin/geom/core + +TAP_TESTS_SH+= run_test + +SUBDIR+= ConfCmp +SUBDIR+= Data +SUBDIR+= MdLoad +SUBDIR+= Ref + +.include <bsd.test.mk> diff --git a/sbin/geom/core/tests/MdLoad/Makefile b/sbin/geom/core/tests/MdLoad/Makefile new file mode 100644 index 0000000..27cf94b --- /dev/null +++ b/sbin/geom/core/tests/MdLoad/Makefile @@ -0,0 +1,18 @@ +# $FreeBSD$ + +BINDIR= ${TESTSBASE}/sbin/geom/core/MdLoad + +PROG= MdLoad + +DPADD= ${LIBSBUF} ${LIBBSDXML} +LDADD= -lsbuf -lbsdxml + +MAN= + +WARNS?= 4 + +check: .PHONY +check: ${PROG} + ./${PROG} md34 ../Data/disk.critter.ad0.xml + +.include <bsd.prog.mk> diff --git a/tools/regression/geom/MdLoad/MdLoad.c b/sbin/geom/core/tests/MdLoad/MdLoad.c index 33ee4de..a7238aaa 100644 --- a/tools/regression/geom/MdLoad/MdLoad.c +++ b/sbin/geom/core/tests/MdLoad/MdLoad.c @@ -35,22 +35,23 @@ * $FreeBSD$ */ +#include <sys/types.h> +#include <sys/mman.h> +#include <sys/queue.h> +#include <sys/sbuf.h> +#include <sys/stat.h> +#include <ctype.h> +#include <err.h> +#include <errno.h> +#include <fcntl.h> +#include <paths.h> +#include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> -#include <stdint.h> #include <string.h> -#include <ctype.h> -#include <errno.h> -#include <paths.h> -#include <fcntl.h> -#include <err.h> + #include <bsdxml.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <sys/queue.h> -#include <sys/sbuf.h> -#include <sys/mman.h> struct sector { LIST_ENTRY(sector) sectors; @@ -216,9 +217,12 @@ g_simdisk_xml_load(const char *file) fd = open(file, O_RDONLY); if (fd < 0) - err(1, file); - fstat(fd, &st); + err(1, "%s: opening %s failed", __func__, file); + if (fstat(fd, &st) == -1) + err(1, "%s: fstat'ing %s failed", __func__, file); p = mmap(NULL, st.st_size, PROT_READ, MAP_NOCORE|MAP_PRIVATE, fd, 0); + if (p == MAP_FAILED) + err(1, "%s: mmap'ing %s failed", __func__, file); i = XML_Parse(parser, p, st.st_size, 1); if (i != 1) errx(1, "XML_Parse complains: return %d", i); @@ -252,7 +256,7 @@ main(int argc, char **argv) sprintf(buf + strlen(buf), " -u %s", argv[1]); error = system(buf); if (error) - return (error); + err(1, "calling `%s` failed; status=%d", buf, error); fd = open(argv[1], O_RDWR); if (fd < 0 && errno == ENOENT) { sprintf(buf, "%s%s", _PATH_DEV, argv[1]); diff --git a/sbin/geom/core/tests/Ref/Makefile b/sbin/geom/core/tests/Ref/Makefile new file mode 100644 index 0000000..582ea33 --- /dev/null +++ b/sbin/geom/core/tests/Ref/Makefile @@ -0,0 +1,21 @@ +# $FreeBSD$ + +FILES+= disk.alpha.da0.xml +FILES+= disk.alpha2.da0.xml +FILES+= disk.apple.xml +FILES+= disk.beast.da0.xml +FILES+= disk.critter.ad0.xml +FILES+= disk.empty.flp.xml +FILES+= disk.far.ad0.xml +FILES+= disk.flat.da1.xml +FILES+= disk.kern.flp.xml +FILES+= disk.msdos.ext.xml +FILES+= disk.msdos.flp.xml +FILES+= disk.pc98.wdc0.xml +FILES+= disk.sun.da0.xml +FILES+= disk.sun.da1.xml +FILES+= disk.typo.ad0.xml + +FILESDIR= ${TESTSBASE}/sbin/geom/core/Ref + +.include <bsd.prog.mk> diff --git a/sbin/geom/core/tests/Ref/disk.alpha.da0.xml b/sbin/geom/core/tests/Ref/disk.alpha.da0.xml new file mode 100644 index 0000000..d2fcacb --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.alpha.da0.xml @@ -0,0 +1,6 @@ +$FreeBSD$ +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 251658240 491520 0 0 +/dev/md34b 512 1086291968 2121664 0 0 +/dev/md34e 512 20971520 40960 0 0 +/dev/md34f 512 16951073792 33107566 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml b/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml new file mode 100644 index 0000000..0323eee --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.alpha2.da0.xml @@ -0,0 +1,4 @@ +$FreeBSD$ +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 24675840 48195 0 0 +/dev/md34b 512 4178442240 8161020 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.apple.xml b/sbin/geom/core/tests/Ref/disk.apple.xml new file mode 100644 index 0000000..bec8403 --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.apple.xml @@ -0,0 +1,5 @@ +$FreeBSD$ +/dev/md34 512 366530560 715880 0 0 +/dev/md34s1 512 366481408 715784 0 0 +/dev/md34s2 512 32256 63 0 0 +/dev/md34s3 512 16384 32 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.beast.da0.xml b/sbin/geom/core/tests/Ref/disk.beast.da0.xml new file mode 100644 index 0000000..a6c922c --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.beast.da0.xml @@ -0,0 +1,4 @@ +$FreeBSD$ +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 4064280576 7938048 0 0 +/dev/md34b 512 270925824 529152 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.critter.ad0.xml b/sbin/geom/core/tests/Ref/disk.critter.ad0.xml new file mode 100644 index 0000000..7d83981 --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.critter.ad0.xml @@ -0,0 +1,10 @@ +$FreeBSD$ +/dev/md34 512 2671841280 5218440 0 0 +/dev/md34s1 512 20003848704 39070017 0 0 +/dev/md34s1a 512 1073741824 2097152 0 0 +/dev/md34s1b 512 1073741824 2097152 0 0 +/dev/md34s1d 512 4447175168 8685889 0 0 +/dev/md34s1e 512 524288000 1024000 0 0 +/dev/md34s1f 512 4294967296 8388608 0 0 +/dev/md34s1g 512 3221225472 6291456 0 0 +/dev/md34s1h 512 5368709120 10485760 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.empty.flp.xml b/sbin/geom/core/tests/Ref/disk.empty.flp.xml new file mode 100644 index 0000000..d0a1b49 --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.empty.flp.xml @@ -0,0 +1,2 @@ +$FreeBSD$ +/dev/md34 512 1474560 2880 0 0 80 2 18 diff --git a/sbin/geom/core/tests/Ref/disk.far.ad0.xml b/sbin/geom/core/tests/Ref/disk.far.ad0.xml new file mode 100644 index 0000000..c929d48 --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.far.ad0.xml @@ -0,0 +1,4 @@ +$FreeBSD$ +/dev/md34 512 5632 11 0 0 +/dev/md34s1 512 296821760 579730 0 0 +/dev/md34s2 512 4564740096 8915508 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.flat.da1.xml b/sbin/geom/core/tests/Ref/disk.flat.da1.xml new file mode 100644 index 0000000..4a02fec --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.flat.da1.xml @@ -0,0 +1,10 @@ +$FreeBSD$ +/dev/md34 512 37888 74 0 0 +/dev/md34a 512 37748736 73728 0 0 +/dev/md34b 512 268435456 524288 0 0 +/dev/md34h 512 8115978240 15851520 0 0 +/dev/md34s1 512 18367017984 35873082 0 0 +/dev/md34s1b 512 419430400 819200 0 0 +/dev/md34s1e 512 419430400 819200 0 0 +/dev/md34s1f 512 1073741824 2097152 0 0 +/dev/md34s1g 512 16454415360 32137530 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.kern.flp.xml b/sbin/geom/core/tests/Ref/disk.kern.flp.xml new file mode 100644 index 0000000..d62c963 --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.kern.flp.xml @@ -0,0 +1,4 @@ +$FreeBSD$ +/dev/md34 512 5632 11 0 0 +/dev/md34a 512 1474560 2880 0 0 +/dev/md34b 512 1474560 2880 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.msdos.ext.xml b/sbin/geom/core/tests/Ref/disk.msdos.ext.xml new file mode 100644 index 0000000..2820c46 --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.msdos.ext.xml @@ -0,0 +1,27 @@ +$FreeBSD$ +/dev/md34 512 2327759360 4546405 0 0 +/dev/md34s1 512 2146765824 4192902 0 0 +/dev/md34s10 512 8193024 16002 0 0 +/dev/md34s11 512 8193024 16002 0 0 +/dev/md34s12 512 8193024 16002 0 0 +/dev/md34s13 512 8193024 16002 0 0 +/dev/md34s14 512 8193024 16002 0 0 +/dev/md34s15 512 8193024 16002 0 0 +/dev/md34s16 512 8193024 16002 0 0 +/dev/md34s17 512 8193024 16002 0 0 +/dev/md34s18 512 8193024 16002 0 0 +/dev/md34s19 512 8193024 16002 0 0 +/dev/md34s2 512 427714560 835380 0 0 +/dev/md34s20 512 8193024 16002 0 0 +/dev/md34s21 512 8193024 16002 0 0 +/dev/md34s22 512 8193024 16002 0 0 +/dev/md34s23 512 8193024 16002 0 0 +/dev/md34s24 512 8193024 16002 0 0 +/dev/md34s25 512 8193024 16002 0 0 +/dev/md34s26 512 8193024 16002 0 0 +/dev/md34s27 512 8193024 16002 0 0 +/dev/md34s5 512 8193024 16002 0 0 +/dev/md34s6 512 8193024 16002 0 0 +/dev/md34s7 512 8193024 16002 0 0 +/dev/md34s8 512 8193024 16002 0 0 +/dev/md34s9 512 8193024 16002 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.msdos.flp.xml b/sbin/geom/core/tests/Ref/disk.msdos.flp.xml new file mode 100644 index 0000000..2b2b63e --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.msdos.flp.xml @@ -0,0 +1,2 @@ +$FreeBSD$ +/dev/md34 512 5632 11 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml b/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml new file mode 100644 index 0000000..ea89ed2 --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.pc98.wdc0.xml @@ -0,0 +1,7 @@ +$FreeBSD$ +/dev/md34 512 75264 147 0 0 1 8 17 +/dev/md34s1 512 1626603520 3176960 23360 0 0 8 17 +/dev/md34s1a 512 78643200 153600 1129 0 0 8 17 +/dev/md34s1b 512 104857600 204800 1505 0 0 8 17 +/dev/md34s1e 512 52428800 102400 752 0 0 8 17 +/dev/md34s1f 512 1390673920 2716160 19971 0 0 8 17 diff --git a/sbin/geom/core/tests/Ref/disk.sun.da0.xml b/sbin/geom/core/tests/Ref/disk.sun.da0.xml new file mode 100644 index 0000000..da6c0aa --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.sun.da0.xml @@ -0,0 +1,5 @@ +$FreeBSD$ +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 1529708544 2987712 0 0 +/dev/md34b 512 539320320 1053360 0 0 +/dev/md34h 512 34629267456 67635288 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.sun.da1.xml b/sbin/geom/core/tests/Ref/disk.sun.da1.xml new file mode 100644 index 0000000..b1fe169 --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.sun.da1.xml @@ -0,0 +1,8 @@ +$FreeBSD$ +/dev/md34 512 5120 10 0 0 +/dev/md34a 512 262967296 513608 0 0 +/dev/md34b 512 1075994624 2101552 0 0 +/dev/md34d 512 11124240384 21727032 0 0 +/dev/md34f 512 2149576704 4198392 0 0 +/dev/md34g 512 2149576704 4198392 0 0 +/dev/md34h 512 1343787008 2624584 0 0 diff --git a/sbin/geom/core/tests/Ref/disk.typo.ad0.xml b/sbin/geom/core/tests/Ref/disk.typo.ad0.xml new file mode 100644 index 0000000..0ff1773 --- /dev/null +++ b/sbin/geom/core/tests/Ref/disk.typo.ad0.xml @@ -0,0 +1,11 @@ +$FreeBSD$ +/dev/md34 512 8585262592 16768091 0 0 +/dev/md34s1 512 3220406784 6289857 0 0 +/dev/md34s1a 512 104857600 204800 0 0 +/dev/md34s1b 512 524288000 1024000 0 0 +/dev/md34s1e 512 524288000 1024000 0 0 +/dev/md34s1f 512 2066973184 4037057 0 0 +/dev/md34s2 512 5364817920 10478160 0 0 +/dev/md34s3 512 8585256960 16768080 0 0 +/dev/md34s3a 512 2097152000 4096000 0 0 +/dev/md34s3d 512 6488104960 12672080 0 0 diff --git a/sbin/geom/core/tests/run_test.sh b/sbin/geom/core/tests/run_test.sh new file mode 100644 index 0000000..bc640e5 --- /dev/null +++ b/sbin/geom/core/tests/run_test.sh @@ -0,0 +1,61 @@ +#!/bin/sh +# $FreeBSD$ + +MD=34 +: ${TMPDIR=/tmp} +TMP=$TMPDIR/$$ + +# The testcases seem to have been broken when the geom_sim provider was removed +echo "# these tests need to be rewritten; they were broken in r113434" +echo "1..0 # SKIP" +exit 0 + +set -e + +# Start from the right directory so we can find all our data files. +testsdir=$(realpath $(dirname $0)) + +# Print the test header +set -- $testsdir/Data/disk.*.xml +echo "1..$#" +data_files="$@" + +trap "rm -f $TMP; mdconfig -d -u $MD" EXIT INT TERM + +set +e + +refdir=$(realpath $(mktemp -d Ref.XXXXXX)) +for f in $data_files; do + b=`basename $f` + mdconfig -d -u $MD + + i=0 + while [ $i -lt 2 -a -c /dev/md$MD ]; do + sleep 1 + : $(( i += 1 )) + done + if [ -c /dev/md$MD ] ; then + echo "Bail out!" + echo "/dev/md$MD is busy" + exit 1 + fi + if ! $testsdir/MdLoad/MdLoad md${MD} $f; then + echo "not ok - $b # MdLoad failed" + continue + fi + if [ ! -f $refdir/$b ]; then + if [ -f $testsdir/Ref/$b ] ; then + grep -v '\$FreeBSD.*\$' $testsdir/Ref/$b > $refdir/$b + else + diskinfo /dev/md${MD}* > $refdir/$b + continue + fi + fi + diskinfo /dev/md${MD}* | diff -u $refdir/$b - > $TMP + if [ $? -eq 0 ]; then + echo "ok - $b" + else + echo "not ok - $b" + sed 's/^/# /' $TMP + fi +done diff --git a/sbin/ggate/ggated/Makefile b/sbin/ggate/ggated/Makefile index af5c9bd..83516c6 100644 --- a/sbin/ggate/ggated/Makefile +++ b/sbin/ggate/ggated/Makefile @@ -6,7 +6,7 @@ PROG= ggated MAN= ggated.8 SRCS= ggated.c ggate.c -LIBADD= pthread +LIBADD= pthread util CFLAGS+= -I${.CURDIR}/../shared diff --git a/sbin/ggate/ggated/ggated.8 b/sbin/ggate/ggated/ggated.8 index dd6109a..15b1792 100644 --- a/sbin/ggate/ggated/ggated.8 +++ b/sbin/ggate/ggated/ggated.8 @@ -37,6 +37,7 @@ .Op Fl v .Op Fl a Ar address .Op Fl p Ar port +.Op Fl F Ar pidfile .Op Fl R Ar rcvbuf .Op Fl S Ar sndbuf .Op Ar "exports file" @@ -67,6 +68,10 @@ Port on which .Nm listens for connections. Default is 3080. +.It Fl F Ar pidfile +PID file that +.Nm +uses. .It Fl R Ar rcvbuf Size of receive buffer to use. Default is 131072 (128kB). @@ -86,6 +91,14 @@ The format of an exports file is as follows: 1.2.3.0/24 RW /tmp/test.img hostname WO /tmp/image .Ed +.El +.Sh FILES +.Bl -tag -width ".Pa /var/run/ggated.pid" -compact +.It Pa /var/run/ggated.pid +The default location of the +.Nm +PID file. +.El .Sh EXIT STATUS Exit status is 0 on success, or 1 if the command fails. To get details about the failure, diff --git a/sbin/ggate/ggated/ggated.c b/sbin/ggate/ggated/ggated.c index a340f01..e234cb5 100644 --- a/sbin/ggate/ggated/ggated.c +++ b/sbin/ggate/ggated/ggated.c @@ -26,32 +26,34 @@ * $FreeBSD$ */ -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <unistd.h> -#include <fcntl.h> -#include <pthread.h> #include <sys/param.h> -#include <sys/queue.h> +#include <sys/bio.h> +#include <sys/disk.h> #include <sys/endian.h> -#include <sys/socket.h> #include <sys/ioctl.h> +#include <sys/queue.h> +#include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> -#include <sys/disk.h> -#include <sys/bio.h> +#include <arpa/inet.h> #include <netinet/in.h> #include <netinet/tcp.h> -#include <arpa/inet.h> -#include <signal.h> #include <assert.h> #include <err.h> #include <errno.h> -#include <string.h> +#include <fcntl.h> #include <libgen.h> -#include <syslog.h> +#include <libutil.h> +#include <paths.h> +#include <pthread.h> +#include <signal.h> #include <stdarg.h> +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <string.h> +#include <syslog.h> +#include <unistd.h> #include "ggate.h" @@ -110,8 +112,8 @@ static void usage(void) { - fprintf(stderr, "usage: %s [-nv] [-a address] [-p port] [-R rcvbuf] " - "[-S sndbuf] [exports file]\n", getprogname()); + fprintf(stderr, "usage: %s [-nv] [-a address] [-F pidfile] [-p port] " + "[-R rcvbuf] [-S sndbuf] [exports file]\n", getprogname()); exit(EXIT_FAILURE); } @@ -946,20 +948,18 @@ huphandler(int sig __unused) int main(int argc, char *argv[]) { + const char *ggated_pidfile = _PATH_VARRUN "/ggated.pid"; + struct pidfh *pfh; struct sockaddr_in serv; struct sockaddr from; socklen_t fromlen; - int sfd, tmpsfd; + pid_t otherpid; + int ch, sfd, tmpsfd; unsigned port; bindaddr = htonl(INADDR_ANY); port = G_GATE_PORT; - for (;;) { - int ch; - - ch = getopt(argc, argv, "a:hnp:R:S:v"); - if (ch == -1) - break; + while ((ch = getopt(argc, argv, "a:hnp:F:R:S:v")) != -1) { switch (ch) { case 'a': bindaddr = g_gate_str2ip(optarg); @@ -968,6 +968,9 @@ main(int argc, char *argv[]) "Invalid IP/host name to bind to."); } break; + case 'F': + ggated_pidfile = optarg; + break; case 'n': nagle = 0; break; @@ -1004,12 +1007,23 @@ main(int argc, char *argv[]) exports_file = argv[0]; exports_get(); + pfh = pidfile_open(ggated_pidfile, 0600, &otherpid); + if (pfh == NULL) { + if (errno == EEXIST) { + errx(EXIT_FAILURE, "Daemon already running, pid: %jd.", + (intmax_t)otherpid); + } + err(EXIT_FAILURE, "Cannot open/create pidfile"); + } + if (!g_gate_verbose) { /* Run in daemon mode. */ if (daemon(0, 0) == -1) g_gate_xlog("Cannot daemonize: %s", strerror(errno)); } + pidfile_write(pfh); + signal(SIGCHLD, SIG_IGN); sfd = socket(AF_INET, SOCK_STREAM, 0); @@ -1046,5 +1060,6 @@ main(int argc, char *argv[]) close(tmpsfd); } close(sfd); + pidfile_remove(pfh); exit(EXIT_SUCCESS); } diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 5aa1949..527de95 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -448,6 +448,12 @@ It has seven targets: all: build the test programs. + check: + runs the test programs from the object directory; if the + Makefile does not itself define the target test, the + targets beforecheck and aftercheck may also be used to + cause actions immediately before and after the test + target is executed. clean: remove the test programs and any object files. cleandir: @@ -466,12 +472,6 @@ It has seven targets: run lint on the source files. tags: create a tags file for the source files. - test: - runs the test programs from the object directory; if the - Makefile does not itself define the target test, the - targets beforetest and aftertest may also be used to - cause actions immediately before and after the test - target is executed. It sets/uses the following variables, among many others: diff --git a/share/mk/bsd.subdir.mk b/share/mk/bsd.subdir.mk index aacd1b3..bbc2d19 100644 --- a/share/mk/bsd.subdir.mk +++ b/share/mk/bsd.subdir.mk @@ -37,10 +37,10 @@ __<bsd.subdir.mk>__: ALL_SUBDIR_TARGETS= all all-man buildconfig buildfiles buildincludes \ - checkdpadd clean cleandepend cleandir cleanilinks \ + check checkdpadd clean cleandepend cleandir cleanilinks \ cleanobj depend distribute files includes installconfig \ installfiles installincludes realinstall lint maninstall \ - manlint obj objlink regress tags \ + manlint obj objlink tags \ ${SUBDIR_TARGETS} # Described above. diff --git a/share/mk/bsd.sys.mk b/share/mk/bsd.sys.mk index de62195..8091826 100644 --- a/share/mk/bsd.sys.mk +++ b/share/mk/bsd.sys.mk @@ -177,11 +177,11 @@ CXXFLAGS+= ${CXXFLAGS.${COMPILER_TYPE}} # or expect to ever be up-to-date. PHONY_NOTMAIN = afterdepend afterinstall all beforedepend beforeinstall \ beforelinking build build-tools buildconfig buildfiles \ - buildincludes checkdpadd clean cleandepend cleandir cleanobj \ - configure depend dependall distclean distribute exe \ + buildincludes check checkdpadd clean cleandepend cleandir \ + cleanobj configure depend dependall distclean distribute exe \ files html includes install installconfig installfiles \ installincludes lint obj objlink objs objwarn realall \ - realdepend realinstall regress subdir-all subdir-depend \ + realdepend realinstall subdir-all subdir-depend \ subdir-install tags whereobj # we don't want ${PROG} to be PHONY diff --git a/share/mk/bsd.test.mk b/share/mk/bsd.test.mk index 86351cf..8102e8a 100644 --- a/share/mk/bsd.test.mk +++ b/share/mk/bsd.test.mk @@ -76,19 +76,14 @@ PROGS_TARGETS+= install .include <suite.test.mk> .endif -.if !target(realtest) -realtest: .PHONY +.if !target(realcheck) +realcheck: .PHONY @echo "$@ not defined; skipping" .endif -test: .PHONY -.ORDER: beforetest realtest -test: beforetest realtest - -.if target(aftertest) -.ORDER: realtest aftertest -test: aftertest -.endif +beforecheck realcheck aftercheck check: .PHONY +.ORDER: beforecheck realcheck aftercheck +check: beforecheck realcheck aftercheck .ifdef PROG # we came here via bsd.progs.mk below diff --git a/share/mk/suite.test.mk b/share/mk/suite.test.mk index 579ef7c..0ffffba 100644 --- a/share/mk/suite.test.mk +++ b/share/mk/suite.test.mk @@ -47,7 +47,7 @@ KYUAFILE?= auto # Path to the prefix of the installed Kyua CLI, if any. # -# If kyua is installed from ports, we automatically define a realtest target +# If kyua is installed from ports, we automatically define a realcheck target # below to run the tests using this tool. The tools are searched for in the # hierarchy specified by this variable. KYUA_PREFIX?= /usr/local @@ -88,9 +88,13 @@ Kyuafile.auto: Makefile @mv Kyuafile.auto.tmp Kyuafile.auto .endif +_kyuafile= ${DESTDIR}${TESTSDIR}/Kyuafile + KYUA?= ${KYUA_PREFIX}/bin/kyua + +realcheck: .PHONY .if exists(${KYUA}) -# Definition of the "make test" target and supporting variables. +# Definition of the "make check" target and supporting variables. # # This target, by necessity, can only work for native builds (i.e. a FreeBSD # host building a release for the same system). The target runs Kyua, which is @@ -99,35 +103,5 @@ KYUA?= ${KYUA_PREFIX}/bin/kyua # Due to the dependencies of the binaries built by the source tree and how they # are used by tests, it is highly possible for a execution of "make test" to # report bogus results unless the new binaries are put in place. -realtest: .PHONY - @echo "*** WARNING: make test is experimental" - @echo "***" - @echo "*** Using this test does not preclude you from running the tests" - @echo "*** installed in ${TESTSBASE}. This test run may raise false" - @echo "*** positives and/or false negatives." - @echo - @${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile; \ - result=0; \ - echo; \ - echo "*** Once again, note that "make test" is unsupported."; \ - test $${result} -eq 0 -.endif - -beforetest: .PHONY -.if defined(TESTSDIR) -.if ${TESTSDIR} == ${TESTSBASE} -# Forbid running from ${TESTSBASE}. It can cause false positives/negatives and -# it does not cover all the tests (e.g. it misses testing software in external). - @echo "*** Sorry, you cannot use make test from src/tests. Install the" - @echo "*** tests into their final location and run them from ${TESTSBASE}" - @false -.else - @echo "*** Using this test does not preclude you from running the tests" - @echo "*** installed in ${TESTSBASE}. This test run may raise false" - @echo "*** positives and/or false negatives." -.endif -.else - @echo "*** No TESTSDIR defined; nothing to do." - @false + @${KYUA} test -k ${DESTDIR}${TESTSDIR}/Kyuafile .endif - @echo diff --git a/tests/sys/Makefile b/tests/sys/Makefile index 015040d..3adf81e 100644 --- a/tests/sys/Makefile +++ b/tests/sys/Makefile @@ -13,13 +13,11 @@ TESTS_SUBDIRS+= kqueue TESTS_SUBDIRS+= mqueue TESTS_SUBDIRS+= netinet TESTS_SUBDIRS+= opencrypto +TESTS_SUBDIRS+= pjdfstest TESTS_SUBDIRS+= posixshm TESTS_SUBDIRS+= vfs TESTS_SUBDIRS+= vm -# Items not integrated into kyua runs by default -SUBDIR+= pjdfstest - SUBDIR_PARALLEL= .include <bsd.test.mk> diff --git a/tools/regression/geom/ConfCmp/Makefile b/tools/regression/geom/ConfCmp/Makefile deleted file mode 100644 index c34cf65..0000000 --- a/tools/regression/geom/ConfCmp/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# $FreeBSD$ - -PROG= ConfCmp -SRCS+= ConfCmp.c -SRCS+= subr_sbuf.c - -.PATH: ../../../../sys/kern - -NO_OBJ= -WARNS?= 5 -CFLAGS+= -g -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -static -# Uncomment for ElectricFence -#LDADD += -lefence -L/usr/local/lib - -LIBADD= bsdxml - -MAN= -CLEANFILES += _* - -.include <bsd.prog.mk> - -test: ${PROG} - rm -f _* *.core - ./${PROG} a1.conf a1.conf - ./${PROG} a1.conf a1a.conf - if ./${PROG} a1.conf a1b.conf > /dev/null 2>&1 ; then exit 1 ; fi - if ./${PROG} a1.conf a1c.conf > /dev/null 2>&1 ; then exit 1 ; fi - if ./${PROG} a1.conf a1d.conf > /dev/null 2>&1 ; then exit 1 ; fi - ./${PROG} a2.conf a2.conf - ./${PROG} a2.conf a2a.conf - if ./${PROG} a2.conf a2b.conf > /dev/null 2>&1 ; then exit 1 ; fi - if ./${PROG} a2.conf a2c.conf > /dev/null 2>&1 ; then exit 1 ; fi - if ./${PROG} a2.conf a2d.conf > /dev/null 2>&1 ; then exit 1 ; fi - diff --git a/tools/regression/geom/MdLoad/Makefile b/tools/regression/geom/MdLoad/Makefile deleted file mode 100644 index 4804f97..0000000 --- a/tools/regression/geom/MdLoad/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -PROG= MdLoad -LIBADD= sbuf bsdxml - -MAN= - - -WARNS?= 4 -.include "bsd.prog.mk" - -test: ${PROG} - ./${PROG} md34 ../Data/disk.critter.ad0.xml diff --git a/tools/regression/geom/Ref/disk.alpha.da0.xml b/tools/regression/geom/Ref/disk.alpha.da0.xml deleted file mode 100644 index a300f0d..0000000 --- a/tools/regression/geom/Ref/disk.alpha.da0.xml +++ /dev/null @@ -1,7 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 251658240 491520 -/dev/md34b 512 1086291968 2121664 -/dev/md34c 512 18309995520 35761710 -/dev/md34e 512 20971520 40960 -/dev/md34f 512 16951073792 33107566 diff --git a/tools/regression/geom/Ref/disk.alpha2.da0.xml b/tools/regression/geom/Ref/disk.alpha2.da0.xml deleted file mode 100644 index 7ef7573..0000000 --- a/tools/regression/geom/Ref/disk.alpha2.da0.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 24675840 48195 -/dev/md34b 512 4178442240 8161020 -/dev/md34c 512 74027520 144585 diff --git a/tools/regression/geom/Ref/disk.apple.xml b/tools/regression/geom/Ref/disk.apple.xml deleted file mode 100644 index a2a0f98..0000000 --- a/tools/regression/geom/Ref/disk.apple.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 366530560 715880 -/dev/md34s1 512 366481408 715784 -/dev/md34s2 512 32256 63 -/dev/md34s3 512 16384 32 diff --git a/tools/regression/geom/Ref/disk.beast.da0.xml b/tools/regression/geom/Ref/disk.beast.da0.xml deleted file mode 100644 index b6aa32e..0000000 --- a/tools/regression/geom/Ref/disk.beast.da0.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 4064280576 7938048 -/dev/md34b 512 270925824 529152 -/dev/md34c 512 4335206400 8467200 diff --git a/tools/regression/geom/Ref/disk.critter.ad0.xml b/tools/regression/geom/Ref/disk.critter.ad0.xml deleted file mode 100644 index 0620bfe..0000000 --- a/tools/regression/geom/Ref/disk.critter.ad0.xml +++ /dev/null @@ -1,11 +0,0 @@ -$FreeBSD$ -/dev/md34 512 2671841280 5218440 -/dev/md34s1 512 20003848704 39070017 -/dev/md34s1a 512 1073741824 2097152 -/dev/md34s1b 512 1073741824 2097152 -/dev/md34s1c 512 20003848704 39070017 -/dev/md34s1d 512 4447175168 8685889 -/dev/md34s1e 512 524288000 1024000 -/dev/md34s1f 512 4294967296 8388608 -/dev/md34s1g 512 3221225472 6291456 -/dev/md34s1h 512 5368709120 10485760 diff --git a/tools/regression/geom/Ref/disk.empty.flp.xml b/tools/regression/geom/Ref/disk.empty.flp.xml deleted file mode 100644 index 659b416..0000000 --- a/tools/regression/geom/Ref/disk.empty.flp.xml +++ /dev/null @@ -1,2 +0,0 @@ -$FreeBSD$ -/dev/md34 512 1474560 2880 80 2 18 diff --git a/tools/regression/geom/Ref/disk.far.ad0.xml b/tools/regression/geom/Ref/disk.far.ad0.xml deleted file mode 100644 index 629816a..0000000 --- a/tools/regression/geom/Ref/disk.far.ad0.xml +++ /dev/null @@ -1,4 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5632 11 -/dev/md34s1 512 296821760 579730 -/dev/md34s2 512 4564740096 8915508 diff --git a/tools/regression/geom/Ref/disk.flat.da1.xml b/tools/regression/geom/Ref/disk.flat.da1.xml deleted file mode 100644 index 89e2df4..0000000 --- a/tools/regression/geom/Ref/disk.flat.da1.xml +++ /dev/null @@ -1,12 +0,0 @@ -$FreeBSD$ -/dev/md34 512 37888 74 -/dev/md34a 512 37748736 73728 -/dev/md34b 512 268435456 524288 -/dev/md34c 512 8422686720 16450560 -/dev/md34h 512 8115978240 15851520 -/dev/md34s1 512 18367017984 35873082 -/dev/md34s1b 512 419430400 819200 -/dev/md34s1c 512 18367017984 35873082 -/dev/md34s1e 512 419430400 819200 -/dev/md34s1f 512 1073741824 2097152 -/dev/md34s1g 512 16454415360 32137530 diff --git a/tools/regression/geom/Ref/disk.kern.flp.xml b/tools/regression/geom/Ref/disk.kern.flp.xml deleted file mode 100644 index 6ff67a0..0000000 --- a/tools/regression/geom/Ref/disk.kern.flp.xml +++ /dev/null @@ -1,5 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5632 11 -/dev/md34a 512 1474560 2880 -/dev/md34b 512 1474560 2880 -/dev/md34c 512 1474560 2880 diff --git a/tools/regression/geom/Ref/disk.msdos.ext.xml b/tools/regression/geom/Ref/disk.msdos.ext.xml deleted file mode 100644 index dc2aced..0000000 --- a/tools/regression/geom/Ref/disk.msdos.ext.xml +++ /dev/null @@ -1,27 +0,0 @@ -$FreeBSD$ -/dev/md34 512 2327759360 4546405 -/dev/md34s1 512 2146765824 4192902 -/dev/md34s10 512 8193024 16002 -/dev/md34s11 512 8193024 16002 -/dev/md34s12 512 8193024 16002 -/dev/md34s13 512 8193024 16002 -/dev/md34s14 512 8193024 16002 -/dev/md34s15 512 8193024 16002 -/dev/md34s16 512 8193024 16002 -/dev/md34s17 512 8193024 16002 -/dev/md34s18 512 8193024 16002 -/dev/md34s19 512 8193024 16002 -/dev/md34s2 512 427714560 835380 -/dev/md34s20 512 8193024 16002 -/dev/md34s21 512 8193024 16002 -/dev/md34s22 512 8193024 16002 -/dev/md34s23 512 8193024 16002 -/dev/md34s24 512 8193024 16002 -/dev/md34s25 512 8193024 16002 -/dev/md34s26 512 8193024 16002 -/dev/md34s27 512 8193024 16002 -/dev/md34s5 512 8193024 16002 -/dev/md34s6 512 8193024 16002 -/dev/md34s7 512 8193024 16002 -/dev/md34s8 512 8193024 16002 -/dev/md34s9 512 8193024 16002 diff --git a/tools/regression/geom/Ref/disk.msdos.flp.xml b/tools/regression/geom/Ref/disk.msdos.flp.xml deleted file mode 100644 index c176c58..0000000 --- a/tools/regression/geom/Ref/disk.msdos.flp.xml +++ /dev/null @@ -1,2 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5632 11 diff --git a/tools/regression/geom/Ref/disk.pc98.wdc0.xml b/tools/regression/geom/Ref/disk.pc98.wdc0.xml deleted file mode 100644 index 5ffb0c9..0000000 --- a/tools/regression/geom/Ref/disk.pc98.wdc0.xml +++ /dev/null @@ -1,8 +0,0 @@ -$FreeBSD$ -/dev/md34 512 75264 147 1 8 17 -/dev/md34s1 512 1626603520 3176960 23360 8 17 -/dev/md34s1a 512 78643200 153600 1129 8 17 -/dev/md34s1b 512 104857600 204800 1505 8 17 -/dev/md34s1c 512 1626603520 3176960 23360 8 17 -/dev/md34s1e 512 52428800 102400 752 8 17 -/dev/md34s1f 512 1390673920 2716160 19971 8 17 diff --git a/tools/regression/geom/Ref/disk.sun.da0.xml b/tools/regression/geom/Ref/disk.sun.da0.xml deleted file mode 100644 index 15b97c8..0000000 --- a/tools/regression/geom/Ref/disk.sun.da0.xml +++ /dev/null @@ -1,6 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 1529708544 2987712 -/dev/md34b 512 539320320 1053360 -/dev/md34c 512 36698296320 71676360 -/dev/md34h 512 34629267456 67635288 diff --git a/tools/regression/geom/Ref/disk.sun.da1.xml b/tools/regression/geom/Ref/disk.sun.da1.xml deleted file mode 100644 index 004771b..0000000 --- a/tools/regression/geom/Ref/disk.sun.da1.xml +++ /dev/null @@ -1,9 +0,0 @@ -$FreeBSD$ -/dev/md34 512 5120 10 -/dev/md34a 512 262967296 513608 -/dev/md34b 512 1075994624 2101552 -/dev/md34c 512 18108555264 35368272 -/dev/md34d 512 11124240384 21727032 -/dev/md34f 512 2149576704 4198392 -/dev/md34g 512 2149576704 4198392 -/dev/md34h 512 1343787008 2624584 diff --git a/tools/regression/geom/Ref/disk.typo.ad0.xml b/tools/regression/geom/Ref/disk.typo.ad0.xml deleted file mode 100644 index 6d537dd..0000000 --- a/tools/regression/geom/Ref/disk.typo.ad0.xml +++ /dev/null @@ -1,14 +0,0 @@ -$FreeBSD$ -/dev/md34 512 8585262592 16768091 -/dev/md34s1 512 3220406784 6289857 -/dev/md34s1a 512 104857600 204800 -/dev/md34s1b 512 524288000 1024000 -/dev/md34s1c 512 3220406784 6289857 -/dev/md34s1e 512 524288000 1024000 -/dev/md34s1f 512 2066973184 4037057 -/dev/md34s2 512 5364817920 10478160 -/dev/md34s2c 512 5364817920 10478160 -/dev/md34s3 512 8585256960 16768080 -/dev/md34s3a 512 2097152000 4096000 -/dev/md34s3c 512 8585256960 16768080 -/dev/md34s3d 512 6488104960 12672080 diff --git a/tools/regression/geom/RunTest.sh b/tools/regression/geom/RunTest.sh deleted file mode 100644 index 46a14b4..0000000 --- a/tools/regression/geom/RunTest.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -MD=34 -TMP=/tmp/$$ - -set -e - -r=0 - -(cd MdLoad && make) > /dev/null 2>&1 - -for f in Data/disk.*.xml -do - b=`basename $f` - mdconfig -d -u $MD > /dev/null 2>&1 || true - if [ -c /dev/md$MD ] ; then - sleep 1 - fi - if [ -c /dev/md$MD ] ; then - sleep 1 - fi - if [ -c /dev/md$MD ] ; then - echo "/dev/md$MD is busy" 1>&2 - exit 1 - fi - MdLoad/MdLoad md${MD} $f - if [ -f Ref/$b ] ; then - if diskinfo /dev/md${MD}* | - diff -I '$FreeBSD' -u Ref/$b - > $TMP; then - echo "PASSED: $b" - else - echo "FAILED: $b" - sed 's/^/ /' $TMP - r=2; - fi - else - diskinfo /dev/md${MD}* > Ref/`basename $f` - fi -done - -mdconfig -d -u $MD > /dev/null 2>&1 || true -rm -f $TMP -exit $r diff --git a/tools/regression/geom/RunTest.t b/tools/regression/geom/RunTest.t deleted file mode 100644 index 96a3530..0000000 --- a/tools/regression/geom/RunTest.t +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -MD=34 -TMP=/tmp/$$ - -set -e - -# Start from the right directory so we can find all our data files. -cd `dirname $0` - -(cd MdLoad && make) > /dev/null 2>&1 - -# Print the test header -echo -n '1..' -echo `ls -1 Data/disk.*.xml | wc -l` - -for f in Data/disk.*.xml -do - b=`basename $f` - mdconfig -d -u $MD > /dev/null 2>&1 || true - if [ -c /dev/md$MD ] ; then - sleep 1 - fi - if [ -c /dev/md$MD ] ; then - sleep 1 - fi - if [ -c /dev/md$MD ] ; then - echo "Bail out!" - echo "/dev/md$MD is busy" - exit 1 - fi - MdLoad/MdLoad md${MD} $f - if [ -f Ref/$b ] ; then - if diskinfo /dev/md${MD}* | - diff -I '$FreeBSD' -u Ref/$b - > $TMP; then - echo "ok - $b" - else - echo "not ok - $b" - sed 's/^/# /' $TMP - fi - else - diskinfo /dev/md${MD}* > Ref/`basename $f` - fi -done - -mdconfig -d -u $MD > /dev/null 2>&1 || true -rm -f $TMP - -exit 0 diff --git a/tools/regression/geom_concat/conf.sh b/tools/regression/geom_concat/conf.sh deleted file mode 100644 index 0eaf1ba..0000000 --- a/tools/regression/geom_concat/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -name="test" -class="concat" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_concat/test-1.t b/tools/regression/geom_concat/test-1.t deleted file mode 100644 index 8984f79..0000000 --- a/tools/regression/geom_concat/test-1.t +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo '1..1' - -us=45 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gconcat create $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 -devwait - -# Size of created device should be 1MB + 2MB + 3MB. - -size=`diskinfo /dev/concat/${name} | awk '{print $3}'` - -if [ $size -eq 6291456 ]; then - echo "ok - Size is 6291456" -else - echo "not ok - Size is 6291456" -fi - -gconcat destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` diff --git a/tools/regression/geom_gate/Makefile b/tools/regression/geom_gate/Makefile deleted file mode 100644 index c5c24ad..0000000 --- a/tools/regression/geom_gate/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -# -# $FreeBSD$ -# -# Regression tests for geom_gate. -# - -test: - @sh runtests.sh diff --git a/tools/regression/geom_gate/runtests.sh b/tools/regression/geom_gate/runtests.sh deleted file mode 100644 index 38089c5..0000000 --- a/tools/regression/geom_gate/runtests.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -dir=`dirname $0` - -for ts in `dirname $0`/test-*.sh; do - sh $ts -done diff --git a/tools/regression/geom_gate/test-1.sh b/tools/regression/geom_gate/test-1.sh deleted file mode 100644 index 44a4960..0000000 --- a/tools/regression/geom_gate/test-1.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work="/dev/md${us}" -src="/dev/md`expr $us + 1`" -conf=`mktemp /tmp/$base.XXXXXX` || exit 1 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1 -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`cat $src | md5 -q` - -echo "127.0.0.1 RW $work" > $conf -ggated $conf -ggatec create -u $us 127.0.0.1 $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -if [ `cat $work | md5 -q` != $sum ]; then - echo "FAIL" -else - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo "FAIL" - else - echo "PASS" - fi -fi - -ggatec destroy -u $us -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -pkill ggated $conf -rm -f $conf diff --git a/tools/regression/geom_gate/test-1.t b/tools/regression/geom_gate/test-1.t deleted file mode 100644 index 279e316..0000000 --- a/tools/regression/geom_gate/test-1.t +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work="/dev/md${us}" -src="/dev/md`expr $us + 1`" -conf=`mktemp /tmp/$base.XXXXXX` || exit 1 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1 -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`cat $src | md5 -q` - -echo "127.0.0.1 RW $work" > $conf -ggated $conf -ggatec create -u $us 127.0.0.1 $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -echo '1..2' - -if [ `cat $work | md5 -q` != $sum ]; then - echo 'not ok 1 - md5 checksum' -else - echo 'ok 1 - md5 checksum' - - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo 'not ok 2 - md5 checksum' - else - echo 'ok 2 - md5 checksum' - fi -fi - -ggatec destroy -u $us -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -pkill ggated $conf -rm -f $conf diff --git a/tools/regression/geom_gate/test-2.sh b/tools/regression/geom_gate/test-2.sh deleted file mode 100644 index 498ac45..0000000 --- a/tools/regression/geom_gate/test-2.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work=`mktemp /tmp/$base.XXXXXX` || exit 1 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`md5 -q $src` - -ggatel create -u $us $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -if [ `md5 -q $work` != $sum ]; then - echo "FAIL" -else - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo "FAIL" - else - echo "PASS" - fi -fi - -ggatel destroy -u $us -rm -f $work $src diff --git a/tools/regression/geom_gate/test-2.t b/tools/regression/geom_gate/test-2.t deleted file mode 100644 index 2e5e254..0000000 --- a/tools/regression/geom_gate/test-2.t +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work=`mktemp /tmp/$base.XXXXXX` || exit 1 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`md5 -q $src` - -ggatel create -u $us $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -echo '1..2' - -if [ `md5 -q $work` != $sum ]; then - echo 'not ok 1 - md5 checksum' -else - echo 'ok 1 - md5 checksum' - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo 'not ok 2 - md5 checksum' - else - echo 'ok 2 - md5 checksum' - fi -fi - -ggatel destroy -u $us -rm -f $work $src diff --git a/tools/regression/geom_gate/test-3.sh b/tools/regression/geom_gate/test-3.sh deleted file mode 100644 index ca73a5a..0000000 --- a/tools/regression/geom_gate/test-3.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work="/dev/md${us}" -src="/dev/md`expr $us + 1`" - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1 -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`cat $src | md5 -q` - -ggatel create -u $us $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -if [ `cat $work | md5 -q` != $sum ]; then - echo "FAIL" -else - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo "FAIL" - else - echo "PASS" - fi -fi - -ggatel destroy -u $us -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` diff --git a/tools/regression/geom_gate/test-3.t b/tools/regression/geom_gate/test-3.t deleted file mode 100644 index ba2b3c7..0000000 --- a/tools/regression/geom_gate/test-3.t +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -base=`basename $0` -us=45 -work="/dev/md${us}" -src="/dev/md`expr $us + 1`" - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 1M -u `expr $us + 1` || exit 1 -dd if=/dev/random of=$work bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/random of=$src bs=1m count=1 >/dev/null 2>&1 -sum=`cat $src | md5 -q` - -ggatel create -u $us $work - -dd if=${src} of=/dev/ggate${us} bs=1m count=1 >/dev/null 2>&1 - -echo '1..2' - -if [ `cat $work | md5 -q` != $sum ]; then - echo 'not ok 1 - md5 checksum' -else - echo 'ok 1 - md5 checksum' - if [ `cat /dev/ggate${us} | md5 -q` != $sum ]; then - echo 'not ok 2 - md5 checksum' - else - echo 'ok 2 - md5 checksum' - fi -fi - -ggatel destroy -u $us -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` diff --git a/tools/regression/geom_mirror/conf.sh b/tools/regression/geom_mirror/conf.sh deleted file mode 100644 index 8a60a16..0000000 --- a/tools/regression/geom_mirror/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 deleted file mode 100644 index b07a8d1..0000000 --- a/tools/regression/geom_mirror/test-1.t +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` - -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 - -gmirror label $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -# Size of created device should be 1MB - 512b. - -size=`diskinfo /dev/mirror/${name} | awk '{print $3}'` - -if [ $size -eq 1048064 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -gmirror remove $name md${us0} -gmirror remove $name md${us1} -gmirror remove $name md${us2} -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 diff --git a/tools/regression/geom_mirror/test-6.t b/tools/regression/geom_mirror/test-6.t deleted file mode 100644 index ec86d06..0000000 --- a/tools/regression/geom_mirror/test-6.t +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..2" - -balance="split" -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=8192 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -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 - -gmirror label -b $balance -s `expr $ddbs / 2` $name /dev/md${us0} /dev/md${us1} || exit 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 - -dd if=/dev/mirror/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -# Connect disk to the mirror. -gmirror insert ${name} md${us2} -# Wait for synchronization. -sleep 1 -dd if=/dev/md${us2} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 2" -else - echo "ok 2" -fi - -gmirror remove $name md${us0} md${us1} md${us2} -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_nop/conf.sh b/tools/regression/geom_nop/conf.sh deleted file mode 100644 index 0dc9797..0000000 --- a/tools/regression/geom_nop/conf.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/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 deleted file mode 100644 index f08f71d..0000000 --- a/tools/regression/geom_nop/test-1.t +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `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 - -# Size of created device should be 1MB. - -size=`diskinfo /dev/md${us}.nop | awk '{print $3}'` - -if [ $size -eq 1048576 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -gnop destroy md${us}.nop -mdconfig -d -u $us diff --git a/tools/regression/geom_nop/test-2.t b/tools/regression/geom_nop/test-2.t deleted file mode 100644 index e0ddb17..0000000 --- a/tools/regression/geom_nop/test-2.t +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -us=45 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -echo "1..1" - -dd if=/dev/random of=${src} bs=1m count=1 >/dev/null 2>&1 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 - -gnop create /dev/md${us} || exit 1 - -dd if=${src} of=/dev/md${us}.nop bs=1m count=1 >/dev/null 2>&1 -dd if=/dev/md${us}.nop of=${dst} bs=1m count=1 >/dev/null 2>&1 - -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -gnop destroy md${us}.nop -mdconfig -d -u $us -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/conf.sh b/tools/regression/geom_raid3/conf.sh deleted file mode 100644 index 93e7dea..0000000 --- a/tools/regression/geom_raid3/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -name="test" -class="raid3" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_raid3/test-10.t b/tools/regression/geom_raid3/test-10.t deleted file mode 100644 index 1320120..0000000 --- a/tools/regression/geom_raid3/test-10.t +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -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 - -graid3 label -r $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-11.t b/tools/regression/geom_raid3/test-11.t deleted file mode 100644 index 3382214..0000000 --- a/tools/regression/geom_raid3/test-11.t +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -ddbs=2048 -nblocks1=1024 -nblocks2=`expr $nblocks1 / \( $ddbs / 512 \)` -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -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 - -graid3 label -w $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait - -dd if=${src} of=/dev/raid3/${name} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 - -dd if=/dev/raid3/${name} of=${dst} bs=$ddbs count=$nblocks2 >/dev/null 2>&1 -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 -rm -f ${src} ${dst} diff --git a/tools/regression/geom_raid3/test-12.t b/tools/regression/geom_raid3/test-12.t deleted file mode 100644 index 3dec406..0000000 --- a/tools/regression/geom_raid3/test-12.t +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us0=45 -us1=`expr $us0 + 1` -us2=`expr $us0 + 2` -nblocks1=9 -nblocks2=`expr $nblocks1 - 1` -nblocks3=`expr $nblocks2 / 2` - -mdconfig -a -t malloc -s $nblocks1 -u $us0 || exit 1 -mdconfig -a -t malloc -s $nblocks1 -u $us1 || exit 1 -mdconfig -a -t malloc -s $nblocks1 -u $us2 || exit 1 - -dd if=/dev/random of=/dev/md${us0} count=$nblocks1 >/dev/null 2>&1 -dd if=/dev/random of=/dev/md${us1} count=$nblocks1 >/dev/null 2>&1 -dd if=/dev/random of=/dev/md${us2} count=$nblocks1 >/dev/null 2>&1 - -graid3 label -w $name /dev/md${us0} /dev/md${us1} /dev/md${us2} || exit 1 -devwait -# Wait for synchronization. -sleep 2 -graid3 stop $name -# Break one component. -dd if=/dev/random of=/dev/md${us1} count=$nblocks2 >/dev/null 2>&1 -# Provoke retaste of the rest components. -true > /dev/md${us0} -true > /dev/md${us2} -sleep 1 - -dd if=/dev/raid3/${name} of=/dev/null bs=1k count=$nblocks3 >/dev/null 2>&1 -ec=$? -if [ $ec -eq 0 ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -graid3 stop $name -mdconfig -d -u $us0 -mdconfig -d -u $us1 -mdconfig -d -u $us2 diff --git a/tools/regression/geom_shsec/conf.sh b/tools/regression/geom_shsec/conf.sh deleted file mode 100644 index 7648862..0000000 --- a/tools/regression/geom_shsec/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -name="test" -class="shsec" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_stripe/conf.sh b/tools/regression/geom_stripe/conf.sh deleted file mode 100644 index 22e5864..0000000 --- a/tools/regression/geom_stripe/conf.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -name="test" -class="stripe" -base=`basename $0` - -. `dirname $0`/../geom_subr.sh diff --git a/tools/regression/geom_stripe/test-1.t b/tools/regression/geom_stripe/test-1.t deleted file mode 100644 index 9b398f0..0000000 --- a/tools/regression/geom_stripe/test-1.t +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us=45 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gstripe create -s 16384 $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 -devwait - -# Size of created device should be 1MB * 3. - -size=`diskinfo /dev/stripe/${name} | awk '{print $3}'` - -if [ $size -eq 3145728 ]; then - echo "ok 1" -else - echo "not ok 1" -fi - -gstripe destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` diff --git a/tools/regression/geom_stripe/test-2.t b/tools/regression/geom_stripe/test-2.t deleted file mode 100644 index 73937f4..0000000 --- a/tools/regression/geom_stripe/test-2.t +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -. `dirname $0`/conf.sh - -echo "1..1" - -us=45 -tsize=3 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 - -dd if=/dev/random of=${src} bs=1m count=$tsize >/dev/null 2>&1 - -mdconfig -a -t malloc -s 1M -u $us || exit 1 -mdconfig -a -t malloc -s 2M -u `expr $us + 1` || exit 1 -mdconfig -a -t malloc -s 3M -u `expr $us + 2` || exit 1 - -gstripe create -s 8192 $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 -devwait - -dd if=${src} of=/dev/stripe/${name} bs=1m count=$tsize >/dev/null 2>&1 -dd if=/dev/stripe/${name} of=${dst} bs=1m count=$tsize >/dev/null 2>&1 - -if [ `md5 -q ${src}` != `md5 -q ${dst}` ]; then - echo "not ok 1" -else - echo "ok 1" -fi - -gstripe destroy $name -mdconfig -d -u $us -mdconfig -d -u `expr $us + 1` -mdconfig -d -u `expr $us + 2` -rm -f ${src} ${dst} diff --git a/tools/regression/geom_subr.sh b/tools/regression/geom_subr.sh deleted file mode 100644 index 6047829..0000000 --- a/tools/regression/geom_subr.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# $FreeBSD$ - -kldstat -q -m g_${class} || g${class} load || exit 1 - -devwait() -{ - while :; do - if [ -c /dev/${class}/${name} ]; then - return - fi - sleep 0.2 - done -} diff --git a/tools/regression/geom_uzip/Makefile b/tools/regression/geom_uzip/Makefile deleted file mode 100644 index 6927ff1..0000000 --- a/tools/regression/geom_uzip/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# -# $FreeBSD$ -# -# Regression test for geom_ugz. -# - -IMAGE= test-1.img -ZIMAGE= ${IMAGE}.uzip -UZIMAGE= ${ZIMAGE}.uue - -test: - @sh runtests.sh - -image: - makefs -s 1048576 ${IMAGE} etalon - printf "#\n# $$" >${UZIMAGE} - printf "FreeBSD$$\n#\n\n" >> ${UZIMAGE} - mkuzip -o ${ZIMAGE} ${IMAGE} - uuencode ${ZIMAGE} ${ZIMAGE} >>${UZIMAGE} - rm ${ZIMAGE} - -clean: - rm -f ${IMAGE} ${ZIMAGE} diff --git a/tools/regression/geom_uzip/runtests.sh b/tools/regression/geom_uzip/runtests.sh deleted file mode 100644 index 60e78b5..0000000 --- a/tools/regression/geom_uzip/runtests.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -dir=`dirname $0` - -for ts in `dirname $0`/test-*.sh; do - sh $ts -done diff --git a/tools/regression/geom_uzip/test-1.img.uzip.uue b/tools/regression/geom_uzip/test-1.img.uzip.uue deleted file mode 100644 index ca16f47..0000000 --- a/tools/regression/geom_uzip/test-1.img.uzip.uue +++ /dev/null @@ -1,110 +0,0 @@ -# -# $FreeBSD$ -# - -begin 755 test-1.img.uzip -M(R$O8FEN+W-H"B-6,BXP($9O<FUA=`IM/6=E;VU?=7II<`HH:VQD<W1A="`M -M;2`D;2`R/B8M?'QK;&1L;V%D("1M*3XF+28F;6]U;G1?8V0Y-C8P("]D978O -M8&UD8V]N9FEG("UA9B`D,&`N=7II<"`D,0IE>&ET("0_"@```````$`````` -M0`````````*0`````````W<````````$F@````````AQ````````")@````` -M```(OP````````CF````````"0T````````)-`````````E;````````"8(` -M```````)J0````````G0````````"?<````````*'@````````I%```````` -M"FP````````*DP````````JZ````````"N$````````+"`````````LO```` -M````"U8````````+?0````````ND````````"\L````````+\@````````P9 -M````````#$`````````,9P````````R.````````#+4````````,W``````` -M``T#````````#2H````````-40````````UX````````#9\````````-Q@`` -M``````WM````````#A0````````..P````````YB````````#HD````````. -ML`````````[7````````#OX````````/)0````````],````````#W,````` -M```/F@````````_!````````#^@````````0#P```````!`V````````$%T` -M```````0A````````!"K````````$-(````````0^0```````!$@```````` -M$4<````````1;@```````!&5````````$<%XVNW4/0K",!3`\1>M$`3!42<[ -M>@1!AX)X`^_@X`VZZ.[%''1V]0+>0(@O[0OMZF`5^?_@-6GS2=L\$0`````` -M````````\"_&&A.-7&-NSX)Z7)=KR41N?1$GUD'OO18#Z[>*EWL(\@QAI-6A -MU.WQHL/J<;ZUF-8++7JM>V?5N-YN<]I7>\@LTGCK%Z.P]CA'J;%(<SDY\C7Q -M%6?OY>*;/SW_H;W97M*9*ZU<O#E-E0^D.9<Q+T@K9WQ48>>^8]YR7'QWX>"< -MUTV$F>7(?M,OY:9D.W6<"0```````````'3J!63?'NAXVNW9,4I#01#&\6^3 -M"*L@6&IE2@]@$=#B@7@#!6^@X`W2F-Z+6(BEM:6%UK9>P!L(ZTS>K"^"B"&8 -M6/Q_,&]W\W8W0\A.LU)KRV+;8FBQ%Y\5\_9\<*2!]-*7DF*"C;,U:S'OT!^O -MI>B]E$WK;JA][P];UJ[+ZEB_L:8W,T[1]>\[/[Z^G.8PB*CK8YY'$^]]C['% -MJ.Z5-!&P"H\YZREW__3A/\HM<JEG;ASM:,YMIO5`W;GTNJ"9FO&GFCCW2Y:C -MQOEO5ZY2RI9$V8T:V>_FU=I4G>PDS@0```````````"6[K2W_GFOE_R&[;M[ -M=?W^CN_&XM;BSN+>XB))^Q9G%I.%,BU?1ROS<Y9^Z_<PUPH````````````` -M`!;S`6\CL0=XVNV:SVXC-1S'TS^PE<6!`T>0?MFN%A8EF:;+BI(]H"1M04NE -M2FW%BA-X,IX9MYYQ9'LZS=[V`1`OP0-PV$=`W+ARX@&X\`A(_.Q)2:A8@50J -M0??WD:9V//[Y:W]_GLETVE;KU>:WX5I366V*7W]\//;E#]^\/5PN'UQ39SY\ -MZY>UYECHK_ZE_HNY[F79N2'];Y^OA+)<;S[_--?_[HK^^]?47W^)_HNY_CNM -M/^L??MWH7I;=&UK_I?[]O]'OW;!^]XK^U?Q'-Z1/$`1!$`1!$`1!$`1!$`1! -M$`1!$,3MP?]=\!D>.V0%0;R2U_\;K?65WJ*^VL,/:TU];?SY<?C?C9]7-IAP -M7.FRYRX<^480MX%-M@GW]HT0H^/=`5@SB9S6RD9&9$98*W4994(77U;/Y#1J -M;@#1XC[0.8=^KP_;6UL?1%L[4?\A;'TT>/1P\&@;TE,M8.]B"O?8)F-/AJ/1 -MWM'3P_%G7S!V(&II8<R-T4JQ]U*C"SC)C:ZR'%PNX$#K,UEFW4\4MQ9XF<#3 -MG#L8*CD1L*\K;#C)A1$=Z.]\N/V`L:].:FXA-E(IF75"A!_'*NGR&3A]+BS; -ME0ED,R/"V4P6L1(@R]"OYK$8L*%24,C"SJ#&L<.)6!N=^>@.&\['+'0AP'"7 -M6]"5RPR&]AB[.Q(UGP<]X7$L3*TG9QTH9F!UV68X73CEM<4.N)!8.IR[[SM1 -M?S1.N)OD;;8\4!6?5C'V-DFS)IM791@J-54A=65AA,W"V#+$WF7L4XQ$\R!' -M?\^UF7(%MM8F\2O-L>^`'>@R`R>+1J+@Y85?4(JY\H;Y%#CH=MFQ!DR_$XEO -MCF>A\TE5N*H`AYNE\<.B5@*\SN6EER$>_<"S.&7K&ZLTE3:_/!=4?%@G+&39 -MJQJ3!6(FT-@44L4+5!GC3\#QTU1)/^^E3>(JE0G,51C+SR:N#.8T";+>SD*T -M&3LLO=.U;L.BUJ2R&8DOZF%"<]-BQ1,4%J4#6\K)F3!=-'ERUO8.*Y$Z+Y$( -M/D],F+IT%E?'$]\E1&9<5<4T]Q./,=9OD^!+SFVP`_<GG^_`A0\?L[%/B--^ -M[W!3V+")8L$+[V*L9VUVB/GG\:G/?\)G;;R0E-(Z;RK8\*Z?P237QGD[?.9Q -M-YSJ6>]?N5`>7^="H?LM0?R76'O)\_]K6'^SM;%^I'5XVG\=C[=:&^Q(3+65 -M3IM9JW4'V[Y?V;BS5SHCA24S">)_QD!<N$$Y.;?=%)_K8IL,HAR_N2/?1%_7 -M!'&[^4>_\=.-@"!N)4LO\Z)^KQ_M&PG#*H/E5WGA]5[$=NDV0!"WB]\!34_J -M#GC:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q -M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@ -M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@ -M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````` -M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````````` -M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<! -M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C: -M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0`` -M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M -M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```` -M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````` -M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````````````` -M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0``` -M`7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q -M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@ -M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@ -M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````` -M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````````` -M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<! -M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C: -M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0`` -M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M -M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```` -M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````` -M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````````````` -M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0``` -M`7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q -M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@ -M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@ -M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````` -M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````````` -M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<! -M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C: -M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0`` -M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M -M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```` -M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````` -M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````````````` -M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0``` -M`7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q -M`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@ -M]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@ -M````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````` -M````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````````` -M````@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<! -M0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C: -M[<$Q`0```,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0`` -M`,*@]4]M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M -M#!^@````````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```` -M````````````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````` -M````````@+<!0````7C:[<$Q`0```,*@]4]M#!^@```````````````````` -M@+<!0````7C:[<$Q`0```,*@]4]M#!^@````````````````````@+<!0``` -M`7C:[=`Q`0``#`(@HQO="GOV0002````````````````````>%$%=P/6@`"! -M```````````````````````````````````````````````````````````` -2```````````````````````` -` -end diff --git a/tools/regression/geom_uzip/test-1.sh b/tools/regression/geom_uzip/test-1.sh deleted file mode 100644 index 7e8f168..0000000 --- a/tools/regression/geom_uzip/test-1.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -mntpoint="/mnt/test-1" - -# -# prepare -kldload geom_uzip -uudecode test-1.img.uzip.uue -num=`mdconfig -an -f test-1.img.uzip` || exit 1 -sleep 1 - -# -# mount -mkdir -p "${mntpoint}" -mount -o ro /dev/md${num}.uzip "${mntpoint}" || exit 1 - -# -# compare -#cat "${mntpoint}/etalon.txt" -diff -u etalon/etalon.txt "${mntpoint}/etalon.txt" -if [ $? -eq 0 ]; then - echo "PASS" -else - echo "FAIL" -fi - -# -# cleanup -umount "${mntpoint}" -rmdir "${mntpoint}" -mdconfig -d -u ${num} -sleep 1 -kldunload geom_uzip diff --git a/tools/regression/geom_uzip/test-2.sh b/tools/regression/geom_uzip/test-2.sh deleted file mode 100644 index 8662827..0000000 --- a/tools/regression/geom_uzip/test-2.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh -# -# $FreeBSD$ -# - -# -# prepare -kldload geom_uzip -uudecode test-1.img.uzip.uue -num=`mdconfig -an -f test-1.img.uzip` || exit 1 -sleep 1 - -# -# destroy -kldunload geom_uzip |
