Date: Wed, 25 Nov 2015 03:57:59 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291284 - user/ngie/more-tests2/sbin/geom/class/tests/concat Message-ID: <201511250357.tAP3vxvJ028054@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Nov 25 03:57:58 2015 New Revision: 291284 URL: https://svnweb.freebsd.org/changeset/base/291284 Log: conf.sh: - Implement gconcat_test_cleanup - Use a random name for the shsec 1_test.sh/2_test.sh: - Attach md devices with attach_md - Remove unnecessary mdconfig -d -u and gconcat destroy calls at the end of the scripts Modified: user/ngie/more-tests2/sbin/geom/class/tests/concat/1_test.sh user/ngie/more-tests2/sbin/geom/class/tests/concat/2_test.sh user/ngie/more-tests2/sbin/geom/class/tests/concat/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/concat/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/concat/1_test.sh Wed Nov 25 03:53:14 2015 (r291283) +++ user/ngie/more-tests2/sbin/geom/class/tests/concat/1_test.sh Wed Nov 25 03:57:58 2015 (r291284) @@ -5,13 +5,11 @@ echo '1..1' -us=45 +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 - -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 # Size of created device should be 1MB + 2MB + 3MB. @@ -23,8 +21,3 @@ if [ $size -eq 6291456 ]; then 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` Modified: user/ngie/more-tests2/sbin/geom/class/tests/concat/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/concat/2_test.sh Wed Nov 25 03:53:14 2015 (r291283) +++ user/ngie/more-tests2/sbin/geom/class/tests/concat/2_test.sh Wed Nov 25 03:57:58 2015 (r291284) @@ -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} Modified: user/ngie/more-tests2/sbin/geom/class/tests/concat/conf.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/concat/conf.sh Wed Nov 25 03:53:14 2015 (r291283) +++ user/ngie/more-tests2/sbin/geom/class/tests/concat/conf.sh Wed Nov 25 03:57:58 2015 (r291284) @@ -1,8 +1,15 @@ #!/bin/sh # $FreeBSD$ -name="test" +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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511250357.tAP3vxvJ028054>