From owner-svn-src-user@freebsd.org Wed Nov 25 03:58:00 2015 Return-Path: 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 765DBA370CC for ; Wed, 25 Nov 2015 03:58:00 +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 4C33B19D2; Wed, 25 Nov 2015 03:58:00 +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 tAP3vxBp028057; Wed, 25 Nov 2015 03:57:59 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAP3vxvJ028054; Wed, 25 Nov 2015 03:57:59 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201511250357.tAP3vxvJ028054@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 25 Nov 2015 03:57:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291284 - user/ngie/more-tests2/sbin/geom/class/tests/concat 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Nov 2015 03:58:00 -0000 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