Date: Wed, 25 Nov 2015 01:29:46 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291279 - user/ngie/more-tests2/sbin/geom/class/tests/stripe Message-ID: <201511250129.tAP1TkLQ083984@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Nov 25 01:29:46 2015 New Revision: 291279 URL: https://svnweb.freebsd.org/changeset/base/291279 Log: - Attach md devices with attach_md - Remove unnecessary mdconfig -d -u and gstripe destroy calls at the end of the scripts Modified: user/ngie/more-tests2/sbin/geom/class/tests/stripe/1_test.sh user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/stripe/1_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/stripe/1_test.sh Wed Nov 25 01:27:51 2015 (r291278) +++ user/ngie/more-tests2/sbin/geom/class/tests/stripe/1_test.sh Wed Nov 25 01:29:46 2015 (r291279) @@ -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 - -gstripe create -s 16384 $name /dev/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || exit 1 +gstripe create -s 16384 $name /dev/$us0 /dev/$us1 /dev/$us2 || exit 1 devwait # Size of created device should be 1MB * 3. @@ -23,8 +21,3 @@ if [ $size -eq 3145728 ]; then 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` Modified: user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh Wed Nov 25 01:27:51 2015 (r291278) +++ user/ngie/more-tests2/sbin/geom/class/tests/stripe/2_test.sh Wed Nov 25 01:29:46 2015 (r291279) @@ -5,18 +5,17 @@ echo "1..1" -us=45 tsize=3 -src=`mktemp /tmp/$base.XXXXXX` || exit 1 -dst=`mktemp /tmp/$base.XXXXXX` || exit 1 +src=`mktemp $TMPDIR/$base.XXXXXX` || exit 1 +dst=`mktemp $TMPDIR/$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 +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/md${us} /dev/md`expr $us + 1` /dev/md`expr $us + 2` || 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 @@ -28,8 +27,4 @@ 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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511250129.tAP1TkLQ083984>