From 7e4f9507784091fcdc0230c8bd79616ff8472284 Mon Sep 17 00:00:00 2001
From: ngie <ngie@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sat, 12 Mar 2016 23:11:08 +0000
Subject: [PATCH] MFC r293434:

- Use attach_md for memory disks so they can be tracked.
- Add a geom_concat specific cleanup function and trap on that function at
  exit so things are cleaned up properly
- Don't hardcode /tmp for temporary files, which violates the kyua sandbox


git-svn-id: svn://svn.freebsd.org/base/stable/10@296777 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 tools/regression/geom_concat/conf.sh  |  7 +++++++
 tools/regression/geom_concat/test-1.t | 15 ++++-----------
 tools/regression/geom_concat/test-2.t | 19 +++++++------------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/tools/regression/geom_concat/conf.sh b/tools/regression/geom_concat/conf.sh
index c8692bbc8..374ed12ae 100644
--- a/tools/regression/geom_concat/conf.sh
+++ b/tools/regression/geom_concat/conf.sh
@@ -5,4 +5,11 @@ 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/tools/regression/geom_concat/test-1.t b/tools/regression/geom_concat/test-1.t
index 8984f79b1..ef80a61bc 100644
--- a/tools/regression/geom_concat/test-1.t
+++ b/tools/regression/geom_concat/test-1.t
@@ -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`
diff --git a/tools/regression/geom_concat/test-2.t b/tools/regression/geom_concat/test-2.t
index 445d9bc71..95636be86 100644
--- a/tools/regression/geom_concat/test-2.t
+++ b/tools/regression/geom_concat/test-2.t
@@ -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}
-- 
2.45.0