Date: Wed, 25 Nov 2015 03:46:49 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r291282 - user/ngie/more-tests2/sbin/geom/class/tests/eli Message-ID: <201511250346.tAP3knJU025029@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Nov 25 03:46:49 2015 New Revision: 291282 URL: https://svnweb.freebsd.org/changeset/base/291282 Log: Probe for the first available md unit number instead of hardcoding 45 Detach/mdconfig -d -u at the end of the test consistently Added: user/ngie/more-tests2/sbin/geom/class/tests/eli/conf.sh - copied, changed from r291237, user/ngie/more-tests2/sbin/geom/class/tests/mirror/conf.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile user/ngie/more-tests2/sbin/geom/class/tests/eli/attach_d_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/configure_b_B_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/delkey_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/detach_l_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_B_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_J_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_a_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_i_P_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/init_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_copy_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_data_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_hmac_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/kill_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/nokey_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_a_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_d_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/readonly_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/resize_test.sh user/ngie/more-tests2/sbin/geom/class/tests/eli/setkey_test.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/Makefile Wed Nov 25 03:46:49 2015 (r291282) @@ -29,4 +29,8 @@ TEST_METADATA.integrity_hmac_test+= time TEST_METADATA.onetime_a_test+= timeout="600" TEST_METADATA.onetime_test+= timeout="600" +FILES+= conf.sh +FILESNAME_conf.sh= conf.sh +FILESDIR= ${TESTSDIR} + .include <bsd.test.mk> Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/attach_d_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/attach_d_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/attach_d_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -34,5 +35,4 @@ else echo "not ok 3" fi -mdconfig -d -u $no rm -f $keyfile Copied and modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/conf.sh (from r291237, user/ngie/more-tests2/sbin/geom/class/tests/mirror/conf.sh) ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/mirror/conf.sh Tue Nov 24 07:55:55 2015 (r291237, copy source) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/conf.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,15 +1,19 @@ #!/bin/sh # $FreeBSD$ -name="$(mktemp -u mirror.XXXXXX)" -class="mirror" +class="eli" base=`basename $0` -gmirror_test_cleanup() +no=0 +while [ -c /dev/md$no ]; do + : $(( no += 1 )) +done + +geli_test_cleanup() { - [ -c /dev/$class/$name ] && gmirror destroy $name - geom_test_cleanup + [ -c /dev/md${no}.eli ] && geli detach md${no}.eli + mdconfig -d -u $no } -trap gmirror_test_cleanup ABRT EXIT INT TERM +trap geli_test_cleanup ABRT EXIT INT TERM . `dirname $0`/../geom_subr.sh Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/configure_b_B_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/configure_b_B_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/configure_b_B_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -126,5 +127,3 @@ if [ $? -eq 0 ]; then else echo "not ok 17" fi - -mdconfig -d -u $no Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/delkey_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/delkey_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/delkey_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile1=`mktemp $base.XXXXXX` || exit 1 keyfile2=`mktemp $base.XXXXXX` || exit 1 @@ -136,5 +137,4 @@ else echo "not ok 14" fi -mdconfig -d -u $no rm -f $keyfile1 $keyfile2 $keyfile3 $keyfile4 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/detach_l_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/detach_l_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/detach_l_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -40,5 +41,4 @@ else echo "not ok 4" fi -mdconfig -d -u $no rm -f $keyfile Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_B_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_B_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_B_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 backupfile=`mktemp $base.XXXXXX` || exit 1 @@ -99,8 +100,5 @@ if [ -c /dev/md${no}.eli ]; then else echo "not ok 13 - -B file" fi -geli detach md${no} -rm -f $backupfile -mdconfig -d -u $no -rm -f $keyfile +rm -f $backupfile $keyfile Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_J_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_J_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_J_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile0=`mktemp $base.XXXXXX` || exit 1 keyfile1=`mktemp $base.XXXXXX` || exit 1 @@ -122,5 +123,4 @@ for iter in -1 0 64; do echo "ok ${i}"; i=$((i+1)) done -mdconfig -d -u $no rm -f ${keyfile0} ${keyfile1} ${passfile0} ${passfile1} Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_a_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_a_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_a_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_i_P_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_i_P_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_i_P_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -18,5 +19,4 @@ else echo "not ok 1" fi -mdconfig -d -u $no rm -f $keyfile Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/init_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/init_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/init_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_copy_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_copy_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_copy_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 sector=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_data_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_data_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_data_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 sector=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_hmac_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_hmac_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/integrity_hmac_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 sector=`mktemp $base.XXXXXX` || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/kill_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/kill_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/kill_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile1=`mktemp $base.XXXXXX` || exit 1 keyfile2=`mktemp $base.XXXXXX` || exit 1 @@ -93,5 +94,4 @@ else echo "not ok 9" fi -mdconfig -d -u $no rm -f $keyfile1 $keyfile2 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/nokey_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/nokey_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/nokey_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 @@ -61,5 +62,4 @@ else echo "not ok 8" fi -mdconfig -d -u $no rm -f $keyfile Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_a_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_a_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_a_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 echo "1..1380" Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_d_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_d_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_d_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 mdconfig -a -t malloc -s $sectors -u $no || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/onetime_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 echo "1..460" Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/readonly_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/readonly_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/readonly_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 keyfile=`mktemp $base.XXXXXX` || exit 1 mdconfig -a -t malloc -s `expr $sectors + 1` -u $no || exit 1 Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/resize_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/resize_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/resize_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,7 +1,8 @@ -#! /bin/sh -# +#!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + echo 1..27 BLK=512 @@ -22,8 +23,6 @@ setsize() { # Initialise -kldload geom_eli >/dev/null 2>&1 - setsize 10 40 || echo -n "not " echo ok $i - "Sized ${md}a to 10m" i=$((i + 1)) @@ -145,6 +144,5 @@ echo ok $i - "Attached ${md}p1.eli" i=$((i + 1)) geli detach ${md}p1.eli -mdconfig -du$unit rm tmp.* Modified: user/ngie/more-tests2/sbin/geom/class/tests/eli/setkey_test.sh ============================================================================== --- user/ngie/more-tests2/sbin/geom/class/tests/eli/setkey_test.sh Wed Nov 25 02:24:08 2015 (r291281) +++ user/ngie/more-tests2/sbin/geom/class/tests/eli/setkey_test.sh Wed Nov 25 03:46:49 2015 (r291282) @@ -1,8 +1,9 @@ #!/bin/sh # $FreeBSD$ +. $(dirname $0)/conf.sh + base=`basename $0` -no=45 sectors=100 rnd=`mktemp $base.XXXXXX` || exit 1 keyfile1=`mktemp $base.XXXXXX` || exit 1 @@ -152,5 +153,4 @@ else echo "not ok 16" fi -mdconfig -d -u $no rm -f $keyfile1 $keyfile2 $keyfile3 $keyfile4 $keyfile5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511250346.tAP3knJU025029>