svn commit: r293442 - head/tools/regression/geom_stripe
Garrett Cooper
ngie at FreeBSD.org
Fri Jan 8 21:28:11 UTC 2016
Author: ngie
Date: Fri Jan 8 21:28:09 2016
New Revision: 293442
URL: https://svnweb.freebsd.org/changeset/base/293442
Log:
- Add a geom_stripe specific cleanup function and trap on that function at
exit so things are cleaned up properly
- Use attach_md for attaching md(4) devices
- Don't hardcode /tmp for temporary files, which violates the kyua sandbox
MFC after: 3 weeks
Sponsored by: EMC / Isilon Storage Division
Modified:
head/tools/regression/geom_stripe/conf.sh
head/tools/regression/geom_stripe/test-1.t
head/tools/regression/geom_stripe/test-2.t
Modified: head/tools/regression/geom_stripe/conf.sh
==============================================================================
--- head/tools/regression/geom_stripe/conf.sh Fri Jan 8 21:25:27 2016 (r293441)
+++ head/tools/regression/geom_stripe/conf.sh Fri Jan 8 21:28:09 2016 (r293442)
@@ -5,4 +5,11 @@ 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
Modified: head/tools/regression/geom_stripe/test-1.t
==============================================================================
--- head/tools/regression/geom_stripe/test-1.t Fri Jan 8 21:25:27 2016 (r293441)
+++ head/tools/regression/geom_stripe/test-1.t Fri Jan 8 21:28:09 2016 (r293442)
@@ -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: head/tools/regression/geom_stripe/test-2.t
==============================================================================
--- head/tools/regression/geom_stripe/test-2.t Fri Jan 8 21:25:27 2016 (r293441)
+++ head/tools/regression/geom_stripe/test-2.t Fri Jan 8 21:28:09 2016 (r293442)
@@ -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 $base.XXXXXX` || exit 1
+dst=`mktemp $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}
More information about the svn-src-all
mailing list