[v9_10] use posix-compatible shell in system tests

3839. [test] Use only posix-compatible shell in system tests. [RT #35625] (cherry picked from commit 60988462e5)
2026-06-10 12:20:00 -04:00 · 2014-05-06 22:06:28 -07:00 · 2014-05-06 22:06:28 -07:00 · 812cf443bb
commit 812cf443bb
parent 0146ff3740
85 changed files with 232 additions and 183 deletions
--- a/3
+++ b/3
@ -1,3 +1,6 @@
+3839.	[test]		Use only posix-compatible shell in system tests.
+			[RT #35625]
+
 3838.	[protocol]	EDNS EXPIRE as been assigned a code point of 9.

 3837.	[security]	A NULL pointer is passed to query_prefetch resulting
--- a/bin/tests/system/acl/setup.sh
+++ b/bin/tests/system/acl/setup.sh
@ -14,8 +14,9 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.3 2008/01/10 23:47:01 tbox Exp $
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh

-sh ../genzone.sh 2 3 >ns2/example.db
-sh ../genzone.sh 2 3 >ns2/tsigzone.db
+$SHELL ../genzone.sh 2 3 >ns2/example.db
+$SHELL ../genzone.sh 2 3 >ns2/tsigzone.db
 cp -f ns2/named1.conf ns2/named.conf
--- a/bin/tests/system/addzone/setup.sh
+++ b/bin/tests/system/addzone/setup.sh
@ -14,9 +14,10 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.3 2010/08/12 01:31:36 marka Exp $
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh

-sh clean.sh
+$SHELL clean.sh

 cp -f ns2/named1.conf ns2/named.conf
 cp -f ns2/default.nzf.in ns2/3bf305731dd26307.nzf
--- a/bin/tests/system/autosign/ns1/keygen.sh
+++ b/bin/tests/system/autosign/ns1/keygen.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: keygen.sh,v 1.8 2011/10/20 23:46:51 tbox Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

@ -23,7 +21,7 @@ zone=.
 zonefile=root.db
 infile=root.db.in

-(cd ../ns2 && sh keygen.sh )
+(cd ../ns2 && $SHELL keygen.sh )

 cat $infile ../ns2/dsset-example. > $zonefile

--- a/bin/tests/system/autosign/ns2/keygen.sh
+++ b/bin/tests/system/autosign/ns2/keygen.sh
@ -14,13 +14,11 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: keygen.sh,v 1.10 2011/06/10 01:51:09 each Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

 # Have the child generate subdomain keys and pass DS sets to us.
-( cd ../ns3 && sh keygen.sh )
+( cd ../ns3 && $SHELL keygen.sh )

 for subdomain in secure nsec3 autonsec3 optout rsasha256 rsasha512 nsec3-to-nsec oldsigs
 do
--- a/bin/tests/system/autosign/prereq.sh
+++ b/bin/tests/system/autosign/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@ -22,4 +22,4 @@ SYSTEMTESTTOP=..
 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

 echo "I:generating keys and preparing zones"
-cd ns1 && sh keygen.sh
+cd ns1 && $SHELL keygen.sh
--- a/bin/tests/system/checkds/setup.sh
+++ b/bin/tests/system/checkds/setup.sh
@ -14,6 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id$
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh

-sh clean.sh
+$SHELL clean.sh
--- a/bin/tests/system/checkds/tests.sh
+++ b/bin/tests/system/checkds/tests.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id$
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

@ -176,6 +174,6 @@ n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`

-if [ $status = 0 ]; then sh clean.sh; fi
+if [ $status = 0 ]; then $SHELL clean.sh; fi
 echo "I:exit status: $status"
 exit $status
--- a/bin/tests/system/cleanall.sh
+++ b/bin/tests/system/cleanall.sh
@ -15,8 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: cleanall.sh,v 1.11 2007/06/19 23:47:00 tbox Exp $
-
 #
 # Clean up after system tests.
 #
@ -34,6 +32,6 @@ status=0

 for d in $SUBDIRS
 do
-   test ! -f $d/clean.sh || ( cd $d && sh clean.sh )
+   test ! -f $d/clean.sh || ( cd $d && $SHELL clean.sh )
   test -d $d && find $d -type d -exec rmdir '{}' \; 2> /dev/null
 done
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@ -74,6 +74,9 @@ SUBDIRS="acl additional allow_query addzone autosign builtin
 	 statistics stub tkey tsig tsiggss unknown upforwd verify
 	 views wildcard xfer xferquota zero zonechecks"

+# Use the CONFIG_SHELL detected by configure for tests
+SHELL=@SHELL@
+
 # PERL will be an empty string if no perl interpreter was found.
 PERL=@PERL@
 if test -n "$PERL"
--- a/bin/tests/system/coverage/prereq.sh
+++ b/bin/tests/system/coverage/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/coverage/setup.sh
+++ b/bin/tests/system/coverage/setup.sh
@ -19,7 +19,7 @@ SYSTEMTESTTOP=..

 KEYGEN="$KEYGEN -qr $RANDFILE"

-sh clean.sh
+$SHELL clean.sh

 ln -s $CHECKZONE named-compilezone

--- a/bin/tests/system/dlv/ns1/sign.sh
+++ b/bin/tests/system/dlv/ns1/sign.sh
@ -14,15 +14,13 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: sign.sh,v 1.3 2011/05/26 23:47:28 tbox Exp $
-
-(cd ../ns2 && sh -e ./sign.sh || exit 1)
-
-echo "I:dlv/ns1/sign.sh"
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

+(cd ../ns2 && $SHELL -e ./sign.sh || exit 1)
+
+echo "I:dlv/ns1/sign.sh"
+
 zone=.
 infile=root.db.in
 zonefile=root.db
--- a/bin/tests/system/dlv/ns2/sign.sh
+++ b/bin/tests/system/dlv/ns2/sign.sh
@ -14,15 +14,13 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: sign.sh,v 1.3 2011/05/26 23:47:28 tbox Exp $
-
-(cd ../ns3 && sh -e ./sign.sh || exit 1)
-
-echo "I:dlv/ns2/sign.sh"
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

+(cd ../ns3 && $SHELL -e ./sign.sh || exit 1)
+
+echo "I:dlv/ns2/sign.sh"
+
 zone=druz.
 infile=druz.db.in
 zonefile=druz.db
--- a/bin/tests/system/dlv/ns3/sign.sh
+++ b/bin/tests/system/dlv/ns3/sign.sh
@ -14,15 +14,13 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: sign.sh,v 1.11 2011/05/26 23:47:28 tbox Exp $
-
-(cd ../ns6 && sh -e ./sign.sh)
-
-echo "I:dlv/ns3/sign.sh"
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

+(cd ../ns6 && $SHELL -e ./sign.sh)
+
+echo "I:dlv/ns3/sign.sh"
+
 dlvzone=dlv.utld.
 dlvsets=
 dssets=
--- a/bin/tests/system/dlv/prereq.sh
+++ b/bin/tests/system/dlv/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/dlv/setup.sh
+++ b/bin/tests/system/dlv/setup.sh
@ -19,4 +19,4 @@ SYSTEMTESTTOP=..

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-(cd ns1 && sh -e sign.sh)
+(cd ns1 && $SHELL -e sign.sh)
--- a/bin/tests/system/dlvauto/prereq.sh
+++ b/bin/tests/system/dlvauto/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/dlvauto/setup.sh
+++ b/bin/tests/system/dlvauto/setup.sh
@ -17,8 +17,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh 
+$SHELL clean.sh 

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns1 && sh sign.sh
+cd ns1 && $SHELL sign.sh
--- a/bin/tests/system/dns64/prereq.sh
+++ b/bin/tests/system/dns64/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/dns64/setup.sh
+++ b/bin/tests/system/dns64/setup.sh
@ -14,11 +14,11 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-sh clean.sh
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns1 && sh sign.sh
+cd ns1 && $SHELL sign.sh
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@ -15,8 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: sign.sh,v 1.37 2011/05/03 16:07:44 marka Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

@ -24,8 +22,8 @@ zone=.
 infile=root.db.in
 zonefile=root.db

-(cd ../ns2 && sh sign.sh )
-(cd ../ns6 && sh sign.sh )
+(cd ../ns2 && $SHELL sign.sh )
+(cd ../ns6 && $SHELL sign.sh )

 cp ../ns2/dsset-example. .
 cp ../ns2/dsset-dlv. .
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@ -15,8 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: sign.sh,v 1.50 2011/11/04 05:36:28 each Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

@ -26,7 +24,7 @@ zonefile=example.db

 # Have the child generate a zone key and pass it to us.

-( cd ../ns3 && sh sign.sh )
+( cd ../ns3 && $SHELL sign.sh )

 for subdomain in secure bogus dynamic keyless nsec3 optout nsec3-unknown \
    optout-unknown multiple rsasha256 rsasha512 kskonly update-nsec3 \
--- a/bin/tests/system/dnssec/prereq.sh
+++ b/bin/tests/system/dnssec/prereq.sh
@ -15,4 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@ -18,11 +18,11 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh 
+$SHELL clean.sh 

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns1 && sh sign.sh
+cd ns1 && $SHELL sign.sh

 echo "a.bogus.example.	A	10.0.0.22" >>../ns3/bogus.example.db.signed

--- a/bin/tests/system/dsdigest/ns1/sign.sh
+++ b/bin/tests/system/dsdigest/ns1/sign.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id$
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

@ -23,7 +21,7 @@ zone=.
 infile=root.db.in
 zonefile=root.db

-(cd ../ns2 && sh sign.sh)
+(cd ../ns2 && $SHELL sign.sh)

 cp ../ns2/dsset-good. .
 cp ../ns2/dsset-bad. .
--- a/bin/tests/system/dsdigest/prereq.sh
+++ b/bin/tests/system/dsdigest/prereq.sh
@ -18,8 +18,8 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

 gostfail=0 ecdsafail=0
-sh ../testcrypto.sh -q gost || gostfail=1
-sh ../testcrypto.sh -q ecdsa || ecdsafail=1
+$SHELL ../testcrypto.sh -q gost || gostfail=1
+$SHELL ../testcrypto.sh -q ecdsa || ecdsafail=1

 if [ $gostfail = 0 -a $ecdsafail = 0 ]; then
 	echo both > supported
--- a/bin/tests/system/dsdigest/setup.sh
+++ b/bin/tests/system/dsdigest/setup.sh
@ -19,4 +19,4 @@ SYSTEMTESTTOP=..

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns1 && sh sign.sh
+cd ns1 && $SHELL sign.sh
--- a/bin/tests/system/ecdsa/prereq.sh
+++ b/bin/tests/system/ecdsa/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh ecdsa
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh ecdsa
--- a/bin/tests/system/ecdsa/setup.sh
+++ b/bin/tests/system/ecdsa/setup.sh
@ -19,4 +19,4 @@ SYSTEMTESTTOP=..

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns1 && sh sign.sh
+cd ns1 && $SHELL sign.sh
--- a/bin/tests/system/filter-aaaa/setup.sh
+++ b/bin/tests/system/filter-aaaa/setup.sh
@ -14,11 +14,11 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-sh clean.sh
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

 cp ns1/named1.conf ns1/named.conf
@ -26,10 +26,10 @@ cp ns2/named1.conf ns2/named.conf
 cp ns3/named1.conf ns3/named.conf
 cp ns4/named1.conf ns4/named.conf

-if sh ../testcrypto.sh -q
+if $SHELL ../testcrypto.sh -q
 then
-	(cd ns1 && sh -e sign.sh)
-	(cd ns4 && sh -e sign.sh)
+	(cd ns1 && $SHELL -e sign.sh)
+	(cd ns4 && $SHELL -e sign.sh)
 else
 	echo "I:using pre-signed zones"
 	cp -f ns1/signed.db.presigned ns1/signed.db.signed
--- a/bin/tests/system/geoip/setup.sh
+++ b/bin/tests/system/geoip/setup.sh
@ -14,7 +14,10 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-sh clean.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+$SHELL clean.sh

 cp ns2/named1.conf ns2/named.conf

--- a/bin/tests/system/gost/prereq.sh
+++ b/bin/tests/system/gost/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh gost
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh gost
--- a/bin/tests/system/gost/setup.sh
+++ b/bin/tests/system/gost/setup.sh
@ -19,4 +19,4 @@ SYSTEMTESTTOP=..

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns1 && sh sign.sh
+cd ns1 && $SHELL sign.sh
--- a/bin/tests/system/inline/ns3/sign.sh
+++ b/bin/tests/system/inline/ns3/sign.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: sign.sh,v 1.8 2012/02/23 06:53:15 marka Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

@ -106,7 +104,7 @@ for alg in ECCGOST ECDSAP256SHA256 NSEC3RSASHA1 DSA
 do
    case $alg in
        DSA)
-            sh ../checkdsa.sh 2> /dev/null || continue
+            $SHELL ../checkdsa.sh 2> /dev/null || continue
            checkfile=../checkdsa
            touch $checkfile ;;
        ECCGOST) 
@ -121,7 +119,7 @@ do
            $KEYGEN -q -r $RANDFILE -a ecdsap256sha256 test > /dev/null 2>&1 || fail=1
            rm -f Ktest*
            [ $fail != 0 ] && continue
-            sh ../checkdsa.sh 2> /dev/null || continue
+            $SHELL ../checkdsa.sh 2> /dev/null || continue
            checkfile=../checkecdsa
            touch $checkfile ;;
        *) ;;
--- a/bin/tests/system/inline/prereq.sh
+++ b/bin/tests/system/inline/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/inline/setup.sh
+++ b/bin/tests/system/inline/setup.sh
@ -12,11 +12,11 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-sh clean.sh
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

 cp ns1/root.db.in ns1/root.db
@ -40,5 +40,5 @@ rm -f ns4/noixfr.db.jnl

 cp ns5/named.conf.pre ns5/named.conf

-(cd ns3; sh -e sign.sh)
-(cd ns1; sh -e sign.sh)
+(cd ns3; $SHELL -e sign.sh)
+(cd ns1; $SHELL -e sign.sh)
--- a/bin/tests/system/ixfr/setup.sh
+++ b/bin/tests/system/ixfr/setup.sh
@ -15,7 +15,8 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.8 2012/02/07 23:47:24 tbox Exp $
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh

 rm -f ns1/*.db ns1/*.jnl ns3/*.jnl ns4/*.db ns4/*.jnl

@ -45,5 +46,5 @@ EOF
 # Setup initial db files for ns3
 cp ns3/mytest0.db ns3/mytest.db
 cp ns3/subtest0.db ns3/subtest.db
-sh ../genzone.sh 3 > ns3/large.db
+$SHELL ../genzone.sh 3 > ns3/large.db
 awk 'END { for (i = 0; i < 10000; i++) printf("record%d 10 IN TXT this is record %d\n", i, i) }' < /dev/null >> ns3/large.db
--- a/bin/tests/system/logfileconfig/setup.sh
+++ b/bin/tests/system/logfileconfig/setup.sh
@ -14,11 +14,9 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.3 2011/03/22 23:47:30 tbox Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh
+$SHELL clean.sh

 cp ns1/named.plain ns1/named.conf
--- a/bin/tests/system/masterformat/prereq.sh
+++ b/bin/tests/system/masterformat/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@ -29,4 +29,4 @@ awk 'END {
 	 for (i = 0; i < 1024; i++ ) { print "b TXT", i; }
 	 for (i = 0; i < 2000; i++ ) { print "c TXT", i; }
 }' < /dev/null >> ns1/large.db
-cd ns1 && sh compile.sh
+cd ns1 && $SHELL compile.sh
--- a/bin/tests/system/metadata/prereq.sh
+++ b/bin/tests/system/metadata/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/metadata/setup.sh
+++ b/bin/tests/system/metadata/setup.sh
@ -16,7 +16,8 @@

 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
-sh ./clean.sh
+
+$SHELL ./clean.sh

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

--- a/bin/tests/system/nsupdate/prereq.sh
+++ b/bin/tests/system/nsupdate/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@ -60,4 +60,4 @@ $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha256 -k sha256-key -z keytests.nil > ns1/
 $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha384 -k sha384-key -z keytests.nil > ns1/sha384.key
 $DDNSCONFGEN -q -r $RANDFILE -a hmac-sha512 -k sha512-key -z keytests.nil > ns1/sha512.key

-(cd ns3; sh -e sign.sh)
+(cd ns3; $SHELL -e sign.sh)
--- a/bin/tests/system/pending/ns1/sign.sh
+++ b/bin/tests/system/pending/ns1/sign.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: sign.sh,v 1.5 2010/01/07 23:48:53 tbox Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

@ -23,7 +21,7 @@ zone=.
 infile=root.db.in
 zonefile=root.db

-(cd ../ns2 && sh -e sign.sh )
+(cd ../ns2 && $SHELL -e sign.sh )

 cp ../ns2/dsset-example. .
 cp ../ns2/dsset-example.com. .
--- a/bin/tests/system/pending/prereq.sh
+++ b/bin/tests/system/pending/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/pending/setup.sh
+++ b/bin/tests/system/pending/setup.sh
@ -19,4 +19,4 @@ SYSTEMTESTTOP=..

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns1 && sh -e sign.sh
+cd ns1 && $SHELL -e sign.sh
--- a/bin/tests/system/pkcs11/prereq.sh
+++ b/bin/tests/system/pkcs11/prereq.sh
@ -14,11 +14,14 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
 echo "I:(Native PKCS#11)" >&2
 rsafail=0 eccfail=0

-sh ../testcrypto.sh -q rsa || rsafail=1
-sh ../testcrypto.sh -q ecdsa || eccfail=1
+$SHELL ../testcrypto.sh -q rsa || rsafail=1
+$SHELL ../testcrypto.sh -q ecdsa || eccfail=1

 if [ $rsafail = 0 -a $eccfail = 0 ]; then
 	echo both > supported
--- a/bin/tests/system/pkcs11ssl/prereq.sh
+++ b/bin/tests/system/pkcs11ssl/prereq.sh
@ -14,5 +14,8 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
 echo "I:(PKCS#11 via OpenSSL)" >&2
-exec sh ../testcrypto.sh rsa
+exec $SHELL ../testcrypto.sh rsa
--- a/bin/tests/system/redirect/prereq.sh
+++ b/bin/tests/system/redirect/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/redirect/setup.sh
+++ b/bin/tests/system/redirect/setup.sh
@ -14,14 +14,13 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.3 2011/03/01 23:48:06 tbox Exp $
-
 SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh

-sh clean.sh
+$SHELL clean.sh

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

 cp ns2/redirect.db.in ns2/redirect.db
 cp ns2/example.db.in ns2/example.db
-cd ns1 && sh sign.sh
+cd ns1 && $SHELL sign.sh
--- a/bin/tests/system/resolver/prereq.sh
+++ b/bin/tests/system/resolver/prereq.sh
@ -15,6 +15,9 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
 if $PERL -e 'use Net::DNS;' 2>/dev/null
 then
    :
@ -23,4 +26,4 @@ else
    exit 1
 fi

-exec sh ../testcrypto.sh
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/resolver/setup.sh
+++ b/bin/tests/system/resolver/setup.sh
@ -23,4 +23,4 @@ cp ns4/tld1.db ns4/tld.db
 cp ns6/to-be-removed.tld.db.in ns6/to-be-removed.tld.db
 cp ns7/server.db.in ns7/server.db
 cp ns7/named1.conf ns7/named.conf
-(cd ns6 && sh keygen.sh)
+(cd ns6 && $SHELL keygen.sh)
--- a/bin/tests/system/rndc/setup.sh
+++ b/bin/tests/system/rndc/setup.sh
@ -14,18 +14,16 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.2 2011/03/21 18:06:06 each Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh
+$SHELL clean.sh

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-sh ../genzone.sh 2 >ns2/nil.db
-sh ../genzone.sh 2 >ns2/other.db
-sh ../genzone.sh 2 >ns2/static.db
+$SHELL ../genzone.sh 2 >ns2/nil.db
+$SHELL ../genzone.sh 2 >ns2/other.db
+$SHELL ../genzone.sh 2 >ns2/static.db

 cat ns4/named.conf.in > ns4/named.conf

--- a/bin/tests/system/rpz/prereq.sh
+++ b/bin/tests/system/rpz/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@ -14,17 +14,14 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id$
-
-
 set -e

 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-QPERF=`sh qperf.sh`
+QPERF=`$SHELL qperf.sh`

-sh clean.sh
+$SHELL clean.sh

 # set up test policy zones.
 #   bl is the main test zone
--- a/bin/tests/system/rrchecker/tests.sh
+++ b/bin/tests/system/rrchecker/tests.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: tests.sh,v 1.4 2008/07/19 00:02:14 each Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

@ -41,7 +39,7 @@ EOF
 }

 ret=0
-sh ../genzone.sh 0 > tempzone
+$SHELL ../genzone.sh 0 > tempzone
 $CHECKZONE -Dq . tempzone | sed '/^;/d' |
 while read -r n tt cl ty rest
 do
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: tests.sh,v 1.13 2012/01/04 23:46:49 tbox Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

@ -248,7 +246,7 @@ status=`expr $status + $ret`

 echo "I: Shutting down slave"

-(cd ..; sh stop.sh rrsetorder ns2 )
+(cd ..; $SHELL stop.sh rrsetorder ns2 )

 echo "I: Checking for slave's on disk copy of zone"

@ -260,7 +258,7 @@ fi

 echo "I: Re-starting slave"

-(cd ..; sh start.sh --noclean rrsetorder ns2 )
+(cd ..; $SHELL start.sh --noclean rrsetorder ns2 )

 #
 #
--- a/bin/tests/system/rsabigexponent/ns1/sign.sh
+++ b/bin/tests/system/rsabigexponent/ns1/sign.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id$
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

@ -45,4 +43,4 @@ EOF
 cp trusted.conf ../ns2/trusted.conf
 cp trusted.conf ../ns3/trusted.conf

-cd ../ns2 && sh -e ./sign.sh
+cd ../ns2 && $SHELL -e ./sign.sh
--- a/bin/tests/system/rsabigexponent/setup.sh
+++ b/bin/tests/system/rsabigexponent/setup.sh
@ -14,11 +14,11 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-sh clean.sh
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns1 && sh -e sign.sh
+cd ns1 && $SHELL -e sign.sh
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@ -15,8 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: run.sh,v 1.45 2010/12/20 21:35:45 each Exp $
-
 #
 # Run a system test.
 #
@ -58,7 +56,7 @@ $PERL testsock.pl || {


 # Check for test-specific prerequisites.
-test ! -f $test/prereq.sh || ( cd $test && sh prereq.sh "$@" )
+test ! -f $test/prereq.sh || ( cd $test && $SHELL prereq.sh "$@" )
 result=$?

 if [ $result -eq 0 ]; then
@ -72,7 +70,7 @@ fi

 # Check for PKCS#11 support
 if
-    test ! -f $test/usepkcs11 || sh cleanpkcs11.sh
+    test ! -f $test/usepkcs11 || $SHELL cleanpkcs11.sh
 then
    : pkcs11 ok
 else
@ -85,14 +83,14 @@ fi
 # Set up any dynamically generated test data
 if test -f $test/setup.sh
 then
-   ( cd $test && sh setup.sh "$@" )
+   ( cd $test && $SHELL setup.sh "$@" )
 fi

 # Start name servers running
 $PERL start.pl $test || exit 1

 # Run the tests
-( cd $test ; sh tests.sh )
+( cd $test ; $SHELL tests.sh )

 status=$?

@ -119,7 +117,7 @@ else
        rm -f $SYSTEMTESTTOP/random.data
 	if test -f $test/clean.sh
 	then
-	   ( cd $test && sh clean.sh "$@" )
+	   ( cd $test && $SHELL clean.sh "$@" )
 	fi
 fi

--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@ -27,7 +27,7 @@ status=0
 {
    for d in $SUBDIRS
    do
-            sh run.sh $d || status=1
+            $SHELL run.sh $d || status=1
    done
 } 2>&1 | tee "systests.output"

--- a/bin/tests/system/setup.sh
+++ b/bin/tests/system/setup.sh
@ -15,8 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.11 2007/06/19 23:47:00 tbox Exp $
-
 #
 # Run a system test.
 #
@ -34,7 +32,7 @@ test -d $test || { echo "$0: $test: no such test" >&2; exit 1; }
 # Set up any dynamically generated test data
 if test -f $test/setup.sh
 then
-   ( cd $test && sh setup.sh "$@" )
+   ( cd $test && $SHELL setup.sh "$@" )
 fi


--- a/bin/tests/system/smartsign/prereq.sh
+++ b/bin/tests/system/smartsign/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/smartsign/setup.sh
+++ b/bin/tests/system/smartsign/setup.sh
@ -17,5 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
--- a/bin/tests/system/staticstub/ns3/sign.sh
+++ b/bin/tests/system/staticstub/ns3/sign.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: sign.sh,v 1.3 2010/12/17 00:57:39 marka Exp $
-
 SYSTEMTESTTOP=../..
 . $SYSTEMTESTTOP/conf.sh

@ -23,7 +21,7 @@ zone=example.
 infile=example.db.in
 zonefile=example.db

-(cd ../ns4 && sh -e sign.sh )
+(cd ../ns4 && $SHELL -e sign.sh )

 cp ../ns4/dsset-sub.example. .

--- a/bin/tests/system/staticstub/prereq.sh
+++ b/bin/tests/system/staticstub/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/staticstub/setup.sh
+++ b/bin/tests/system/staticstub/setup.sh
@ -23,4 +23,4 @@ sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.db.s

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns3 && sh -e sign.sh
+cd ns3 && $SHELL -e sign.sh
--- a/bin/tests/system/stress/tests.sh
+++ b/bin/tests/system/stress/tests.sh
@ -15,8 +15,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: tests.sh,v 1.5 2007/06/19 23:47:05 tbox Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

@ -31,7 +29,7 @@ else
 fi

 (
-sh -c "while true
+$SHELL -c "while true
           do $RNDC -c ../common/rndc.conf -s 10.53.0.3 -p 9953 reload 2>&1 |
 	       sed 's/^/I:ns3 /';
 	   sleep 1
--- a/bin/tests/system/tkey/prereq.sh
+++ b/bin/tests/system/tkey/prereq.sh
@ -15,4 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/tkey/setup.sh
+++ b/bin/tests/system/tkey/setup.sh
@ -18,8 +18,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh
+$SHELL clean.sh

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-cd ns1 && sh setup.sh
+cd ns1 && $SHELL setup.sh
--- a/bin/tests/system/tsiggss/prereq.sh
+++ b/bin/tests/system/tsiggss/prereq.sh
@ -14,6 +14,9 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
 # enable the tsiggss test only if gssapi was enabled
 ./gssapi_krb ||  {
        echo "I:gssapi and krb5 not supported - skipping tsiggss test"
@ -21,4 +24,4 @@
 }

 # ... and crypto
-exec sh ../testcrypto.sh
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/tsiggss/setup.sh
+++ b/bin/tests/system/tsiggss/setup.sh
@ -14,8 +14,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.5 2011/03/21 23:47:21 tbox Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

--- a/bin/tests/system/unknown/prereq.sh
+++ b/bin/tests/system/unknown/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/unknown/setup.sh
+++ b/bin/tests/system/unknown/setup.sh
@ -15,7 +15,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh 
+$SHELL clean.sh 
+
 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-(cd ns3; sh -e sign.sh)
+(cd ns3; $SHELL -e sign.sh)
--- a/bin/tests/system/verify/prereq.sh
+++ b/bin/tests/system/verify/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/verify/setup.sh
+++ b/bin/tests/system/verify/setup.sh
@ -17,7 +17,8 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh 
+$SHELL clean.sh 
+
 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-(cd zones && sh genzones.sh)
+(cd zones && $SHELL genzones.sh)
--- a/bin/tests/system/wildcard/prereq.sh
+++ b/bin/tests/system/wildcard/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/wildcard/setup.sh
+++ b/bin/tests/system/wildcard/setup.sh
@ -19,4 +19,4 @@ SYSTEMTESTTOP=..

 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-(cd ns1 && sh -e sign.sh)
+(cd ns1 && $SHELL -e sign.sh)
--- a/bin/tests/system/xfer/setup.sh
+++ b/bin/tests/system/xfer/setup.sh
@ -15,18 +15,16 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-# $Id: setup.sh,v 1.9 2011/12/01 00:53:58 marka Exp $
-
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh
+$SHELL clean.sh

-sh ../genzone.sh 1 6 7 >ns1/slave.db
-sh ../genzone.sh 2 3 >ns2/example.db
-sh ../genzone.sh 2 3 >ns2/tsigzone.db
-sh ../genzone.sh 6 3 >ns6/master.db
-sh ../genzone.sh 7 >ns7/master2.db
+$SHELL ../genzone.sh 1 6 7 >ns1/slave.db
+$SHELL ../genzone.sh 2 3 >ns2/example.db
+$SHELL ../genzone.sh 2 3 >ns2/tsigzone.db
+$SHELL ../genzone.sh 6 3 >ns6/master.db
+$SHELL ../genzone.sh 7 >ns7/master2.db

 rm -f ns4/*.db ns4/*.jnl
 cp -f ns4/root.db.in ns4/root.db
--- a/bin/tests/system/zero/setup.sh
+++ b/bin/tests/system/zero/setup.sh
@ -12,4 +12,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-sh ../genzone.sh 2 4 | sed -e 's/^$TTL 3600$/$TTL 0 ; force TTL to zero/' -e 's/86400.IN SOA/0 SOA/' > ns2/example.db
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+$SHELL ../genzone.sh 2 4 | sed -e 's/^$TTL 3600$/$TTL 0 ; force TTL to zero/' -e 's/86400.IN SOA/0 SOA/' > ns2/example.db
--- a/bin/tests/system/zonechecks/prereq.sh
+++ b/bin/tests/system/zonechecks/prereq.sh
@ -14,4 +14,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.

-exec sh ../testcrypto.sh
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+exec $SHELL ../testcrypto.sh
--- a/bin/tests/system/zonechecks/setup.sh
+++ b/bin/tests/system/zonechecks/setup.sh
@ -17,10 +17,11 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh

-sh clean.sh
+$SHELL clean.sh
+
 test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

-sh ../genzone.sh 1 > ns1/master.db
+$SHELL ../genzone.sh 1 > ns1/master.db
 cd ns1
 touch master.db.signed
 echo '$INCLUDE "master.db.signed"' >> master.db