From owner-svn-src-user@freebsd.org Wed Nov 25 03:53:15 2015
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id B0957A37086
for <svn-src-user@mailman.ysv.freebsd.org>;
Wed, 25 Nov 2015 03:53:15 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id 6F0EA18A3;
Wed, 25 Nov 2015 03:53:15 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAP3rEjx027723;
Wed, 25 Nov 2015 03:53:14 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP3rECE027720;
Wed, 25 Nov 2015 03:53:14 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201511250353.tAP3rECE027720@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Wed, 25 Nov 2015 03:53:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r291283 - user/ngie/more-tests2/sbin/geom/class/tests/nop
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 25 Nov 2015 03:53:15 -0000
Author: ngie
Date: Wed Nov 25 03:53:14 2015
New Revision: 291283
URL: https://svnweb.freebsd.org/changeset/base/291283
Log:
conf.sh:
- Implement gnop_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 gstripe destroy calls at the end
of the scripts
Modified:
user/ngie/more-tests2/sbin/geom/class/tests/nop/1_test.sh
user/ngie/more-tests2/sbin/geom/class/tests/nop/2_test.sh
user/ngie/more-tests2/sbin/geom/class/tests/nop/conf.sh
Modified: user/ngie/more-tests2/sbin/geom/class/tests/nop/1_test.sh
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/nop/1_test.sh Wed Nov 25 03:46:49 2015 (r291282)
+++ user/ngie/more-tests2/sbin/geom/class/tests/nop/1_test.sh Wed Nov 25 03:53:14 2015 (r291283)
@@ -5,21 +5,16 @@
echo "1..1"
-us=45
+us=$(attach_md -t malloc -s 1M) || exit 1
-mdconfig -a -t malloc -s 1M -u $us || exit 1
-
-gnop create /dev/md${us} || exit 1
+gnop create /dev/${us} || exit 1
# Size of created device should be 1MB.
-size=`diskinfo /dev/md${us}.nop | awk '{print $3}'`
+size=`diskinfo /dev/${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
Modified: user/ngie/more-tests2/sbin/geom/class/tests/nop/2_test.sh
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/nop/2_test.sh Wed Nov 25 03:46:49 2015 (r291282)
+++ user/ngie/more-tests2/sbin/geom/class/tests/nop/2_test.sh Wed Nov 25 03:53:14 2015 (r291283)
@@ -3,20 +3,19 @@
. `dirname $0`/conf.sh
-us=45
-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
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
+us=$(attach_md -t malloc -s 1M) || exit 1
-gnop create /dev/md${us} || exit 1
+gnop create /dev/${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
+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"
@@ -24,6 +23,4 @@ else
echo "ok 1"
fi
-gnop destroy md${us}.nop
-mdconfig -d -u $us
rm -f ${src} ${dst}
Modified: user/ngie/more-tests2/sbin/geom/class/tests/nop/conf.sh
==============================================================================
--- user/ngie/more-tests2/sbin/geom/class/tests/nop/conf.sh Wed Nov 25 03:46:49 2015 (r291282)
+++ user/ngie/more-tests2/sbin/geom/class/tests/nop/conf.sh Wed Nov 25 03:53:14 2015 (r291283)
@@ -4,4 +4,11 @@
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