[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 60988462e5d6db53205851d056e3482a29239be9)

diff --git a/CHANGES b/CHANGES
index 45174fb36e19e3ee38a5c21fa2480ce6ed92bf32..cd04d58202993a47f9c61e35b07017a6cbafcf11 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -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

diff --git a/bin/tests/system/acl/setup.sh b/bin/tests/system/acl/setup.sh
index f9611b5ce60eeea09a08143dac47f7e17afcfbb1..b165f58fb2aaeb990a8b24bc0d30c7905bf917cc 100644 (file)
--- 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

diff --git a/bin/tests/system/addzone/setup.sh b/bin/tests/system/addzone/setup.sh
index 9cc562ca724ac761559f2842087b1affd70516e1..83cca35918cc6f7d864d57b6fafdaf67ac891a70 100644 (file)
--- 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

diff --git a/bin/tests/system/autosign/ns1/keygen.sh b/bin/tests/system/autosign/ns1/keygen.sh
index d849636a812b234907a4a159ea2c61c3ae5db6e0..7b1b3c71862f0a5df778f14a0da4ce1d36db3ab3 100644 (file)
--- 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
 

diff --git a/bin/tests/system/autosign/ns2/keygen.sh b/bin/tests/system/autosign/ns2/keygen.sh
index d6b75b9e6aa10625411d79e338b6d44848b06585..a7686e06a40db6a9654f77729e170a9d01e575fd 100644 (file)
--- 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

diff --git a/bin/tests/system/autosign/prereq.sh b/bin/tests/system/autosign/prereq.sh
index 9991a55fbf8f8c93a924bdeaf6c87eacdddda0dc..fad362b9c5acd43c3aa4f71e4f1bc6a4911f2a2e 100644 (file)
--- 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

diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index 50c004891154aceed2d93f00b76949b0b5f05850..a1550fbdd1f409fe285692c751c316af029d07b4 100644 (file)
--- 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

diff --git a/bin/tests/system/checkds/setup.sh b/bin/tests/system/checkds/setup.sh
index 25047cda1f888dc1afe9d52b95a6fd44e1b62245..935c590df4ad45c0ba04f368101407a30d028e98 100644 (file)
--- 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

diff --git a/bin/tests/system/checkds/tests.sh b/bin/tests/system/checkds/tests.sh
index 1d815083be8cae95d5312a6d9f0d166a1804b5c8..7b6f669957b03c917feaf45a0b5f91e5e997b0b8 100644 (file)
--- 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

diff --git a/bin/tests/system/cleanall.sh b/bin/tests/system/cleanall.sh
index fc4c013bbe49a6d768b163bf61bac7481507a245..a94b1f7f18cca38f1fc3c81ff25a597aa5b9818b 100644 (file)
--- 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

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 4a7dbdfdaefbd6447c47b11533935601cb8ea13e..6a1fee33ba16c6c3bfda7f8ef5e00465c1d8b7fa 100644 (file)
--- 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"

diff --git a/bin/tests/system/coverage/prereq.sh b/bin/tests/system/coverage/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/coverage/setup.sh b/bin/tests/system/coverage/setup.sh
index d8f3f7cb45db3e58b74aa915bc837311b1499857..a803ffdaa82a57498550b4c55be6961da39a3359 100644 (file)
--- 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
 

diff --git a/bin/tests/system/dlv/ns1/sign.sh b/bin/tests/system/dlv/ns1/sign.sh
index 60ad8f6b9c3b8a275eca2711de30b19f241cffbb..1c34311e41b2f182b90a5eb4e5b48497f58f5ee9 100755 (executable)
--- 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 $
+SYSTEMTESTTOP=../..
+. $SYSTEMTESTTOP/conf.sh
 
-(cd ../ns2 && sh -e ./sign.sh || exit 1)
+(cd ../ns2 && $SHELL -e ./sign.sh || exit 1)
 
 echo "I:dlv/ns1/sign.sh"
 
-SYSTEMTESTTOP=../..
-. $SYSTEMTESTTOP/conf.sh
-
 zone=.
 infile=root.db.in
 zonefile=root.db

diff --git a/bin/tests/system/dlv/ns2/sign.sh b/bin/tests/system/dlv/ns2/sign.sh
index 49fb83f044ca686a8dab690322902e92231b48ef..c1cc83b1970506074cb80a9c1d18909ece8928dc 100755 (executable)
--- 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 $
+SYSTEMTESTTOP=../..
+. $SYSTEMTESTTOP/conf.sh
 
-(cd ../ns3 && sh -e ./sign.sh || exit 1)
+(cd ../ns3 && $SHELL -e ./sign.sh || exit 1)
 
 echo "I:dlv/ns2/sign.sh"
 
-SYSTEMTESTTOP=../..
-. $SYSTEMTESTTOP/conf.sh
-
 zone=druz.
 infile=druz.db.in
 zonefile=druz.db

diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh
index 8958e41c3c729c7c305de68440d7023e75a104ce..33bc50e16fba4cbe43c14a62ad8bd51d80637f6e 100755 (executable)
--- 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 $
+SYSTEMTESTTOP=../..
+. $SYSTEMTESTTOP/conf.sh
 
-(cd ../ns6 && sh -e ./sign.sh)
+(cd ../ns6 && $SHELL -e ./sign.sh)
 
 echo "I:dlv/ns3/sign.sh"
 
-SYSTEMTESTTOP=../..
-. $SYSTEMTESTTOP/conf.sh
-
 dlvzone=dlv.utld.
 dlvsets=
 dssets=

diff --git a/bin/tests/system/dlv/prereq.sh b/bin/tests/system/dlv/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh
index c75b00cae13e6f8a59603b9c407dc9eb8da13e97..5539f1bc732e67f3b956629e643a1352a6d1d133 100644 (file)
--- 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)

diff --git a/bin/tests/system/dlvauto/prereq.sh b/bin/tests/system/dlvauto/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/dlvauto/setup.sh b/bin/tests/system/dlvauto/setup.sh
index 774050079ab502c8b4c696cac13e35d215972a26..de8e6cc9e982ddd2a50a5002c33e3f4692764f53 100644 (file)
--- 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

diff --git a/bin/tests/system/dns64/prereq.sh b/bin/tests/system/dns64/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh
index f9700cdde64ae9f9e2616c7bd03d5f60dc60dd45..4afe9e6cdb11e29b7faef723c80c1ed729d9538a 100644 (file)
--- 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

diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index 486635e89985b8a6f48726dacc6a0698c46c3687..31009452bdce6ef3d694e34908454a824cb24dce 100644 (file)
--- 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. .

diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index 1b3d4c7fee359d2b069b400e9d2bd9446c0403b7..a4dcad3788f462f84a3c7c67bb17e08b025a11e3 100644 (file)
--- 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 \

diff --git a/bin/tests/system/dnssec/prereq.sh b/bin/tests/system/dnssec/prereq.sh
index 3edb96111310e8d12825a0dd61adc7068f38e78f..46578eeca8c61a3cc71116810236b86a51ee7a46 100644 (file)
--- 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

diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 4d5ee498e59275ba0ddd145af3d786f68d0e495f..12a5f8503d9d27f5f0de87aa3c368e9e13a7d002 100644 (file)
--- 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
 

diff --git a/bin/tests/system/dsdigest/ns1/sign.sh b/bin/tests/system/dsdigest/ns1/sign.sh
index d947d2f8c63267ace5409d2911e87717799038c1..229faa7a8c3133afb6bebbbc8195455183180e14 100644 (file)
--- 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. .

diff --git a/bin/tests/system/dsdigest/prereq.sh b/bin/tests/system/dsdigest/prereq.sh
index ef21ed5ba8cbc815bb805b36a9f020ab5ef9577f..83ef9f9ca326aebc3be5943b7f0abdb0c6aafa05 100644 (file)
--- 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

diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh
index 74b5270e7dcabc3915e079a3920e06042916fc64..36a719bc1f519e9b261e57cf1684e8488d8baeca 100644 (file)
--- 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

diff --git a/bin/tests/system/ecdsa/prereq.sh b/bin/tests/system/ecdsa/prereq.sh
index 8a6b44fdfcf48652ec7c9c0a3386b056b389210d..f0b1ff24a1b37b4928485eb4767a7632fb41bb01 100644 (file)
--- 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

diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh
index 74b5270e7dcabc3915e079a3920e06042916fc64..36a719bc1f519e9b261e57cf1684e8488d8baeca 100644 (file)
--- 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

diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter-aaaa/setup.sh
index 5fdbbe670b60e496e6042398125f80e76828dc54..ad604f79c6b61740dbc4d9f222cae2eecde6cdd6 100644 (file)
--- 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

diff --git a/bin/tests/system/geoip/setup.sh b/bin/tests/system/geoip/setup.sh
index e55d0353a1cac6b93981758620be5bd15f6fbd51..788aaa1e28d42453da6a5cf14e7d6ce73f22bd92 100644 (file)
--- 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
 

diff --git a/bin/tests/system/gost/prereq.sh b/bin/tests/system/gost/prereq.sh
index a49e8ff9c1f20f4c5fdd04109c035a3e3d5e40d8..f95f61cfe8abeee03863d4f56541ffbb16461249 100644 (file)
--- 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

diff --git a/bin/tests/system/gost/setup.sh b/bin/tests/system/gost/setup.sh
index de5e80acb1ccf3aa81687ea7692439d5ebf5fd85..dc0c17d975fbb247df6240dcb2b4a4be294cdb9d 100644 (file)
--- 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

diff --git a/bin/tests/system/inline/ns3/sign.sh b/bin/tests/system/inline/ns3/sign.sh
index 8ffb5984aa2bdb6b3b3d5be0b353db5893f08e7f..d51d288a96329727574b6bd2f0608eeb0fbb0d57 100755 (executable)
--- 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 ;;
         *) ;;

diff --git a/bin/tests/system/inline/prereq.sh b/bin/tests/system/inline/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh
index dea15961ac224958bbade9fd062c112272465578..3a8ac278ee6f800c2693a22941e313ed2711c74c 100644 (file)
--- 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)

diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh
index 12abbb7fe3c3f4acf0b741dced49e6c7918af9c7..542a042708263d9cda198607d4857831bcae30a8 100644 (file)
--- 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

diff --git a/bin/tests/system/logfileconfig/setup.sh b/bin/tests/system/logfileconfig/setup.sh
index 7bd2684034985cf0586ec23ec209d46485e7a19e..15025418a5ade6bca1e71a4a34b16cd46176a62b 100644 (file)
--- 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

diff --git a/bin/tests/system/masterformat/prereq.sh b/bin/tests/system/masterformat/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100755 (executable)
--- 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

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index aa6f9e0a4f6ad98e563e7f6698cf56b3a1308f3b..96f512306e78014d8092333f21f7d1fa0dd45644 100755 (executable)
--- 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

diff --git a/bin/tests/system/metadata/prereq.sh b/bin/tests/system/metadata/prereq.sh
index 130935906cdb63298f4781965c8b087e86744f5d..db582402376ae8cb6a6301d07c380aec7f261df6 100644 (file)
--- 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

diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh
index 95e03e54a3b6f78a0ab29e5544af64274a75a470..9b82595f63dd78de22265381f95f052ca1683a66 100644 (file)
--- 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
 

diff --git a/bin/tests/system/nsupdate/prereq.sh b/bin/tests/system/nsupdate/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index 31d1562345f6561756441d01ef12a6be0ab719df..828255ee530be5045ae7d3bfebf8c5c2f7d60d92 100644 (file)
--- 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)

diff --git a/bin/tests/system/pending/ns1/sign.sh b/bin/tests/system/pending/ns1/sign.sh
index 1090a97ec3b51e883f4e849a3e012ca21243ca52..37d7ee40d6c4b03e00f8dfd48d55be50cb4122e4 100644 (file)
--- 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. .

diff --git a/bin/tests/system/pending/prereq.sh b/bin/tests/system/pending/prereq.sh
index 130935906cdb63298f4781965c8b087e86744f5d..db582402376ae8cb6a6301d07c380aec7f261df6 100644 (file)
--- 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

diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh
index d1111ae1b695b1e8a0cc3dc6d0fb790092b67ab4..02cc783efa7ca69df254fbae269df92027f1a073 100644 (file)
--- 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

diff --git a/bin/tests/system/pkcs11/prereq.sh b/bin/tests/system/pkcs11/prereq.sh
index 7aebf1cf2173b403635854b4404962d9e7a56ddd..c832ab96eb8cf37305428607c4cbef7f59eab61e 100644 (file)
--- 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

diff --git a/bin/tests/system/pkcs11ssl/prereq.sh b/bin/tests/system/pkcs11ssl/prereq.sh
index 54ed812438dc719fe81cd89bc2940cd0b7f6a218..9c006e2f847f9783de438f76012d3acdf2eeaeda 100644 (file)
--- 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

diff --git a/bin/tests/system/redirect/prereq.sh b/bin/tests/system/redirect/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh
index d134b1c5ac436e042adabb6778c2a2d26f6583dc..9fecc9ad811a0e0eca06b5f33ac02a584cecb9fc 100644 (file)
--- 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

diff --git a/bin/tests/system/resolver/prereq.sh b/bin/tests/system/resolver/prereq.sh
index de210322700f1c05ee5d400351bab40931fc9735..b3fef67438f9c7dd1e6630bc1148280c5aa5baf9 100644 (file)
--- 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

diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh
index f4c19d7dac4ab185907ed6bd882e972b260a9630..4b3a2c83b94ff526834a75e4b2a09f6d9d20289b 100644 (file)
--- 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)

diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
index 459a4f4744a6df5e3963ca42832f949efa042d7a..26812ae4832999d97d38e19e10bbb99f0ccf9612 100644 (file)
--- 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
 

diff --git a/bin/tests/system/rpz/prereq.sh b/bin/tests/system/rpz/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index 9355c649e5445518d647a8535bf7d39a74196cd7..6db6fb2dfae06561d37d0f907a12b672e9376ab0 100644 (file)
--- 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

diff --git a/bin/tests/system/rrchecker/tests.sh b/bin/tests/system/rrchecker/tests.sh
index 5eee5ee8ee2e3c57b2443e188f2fc4e3d0983a15..6b4e9b0bfa2202464df0002d4992c8de93b95c31 100644 (file)
--- 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

diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index 8ac3aeb1462a33fc0f208e4a59de628301ec9959..fe75fb31df8a51de73edaf214caec62b1bc33033 100644 (file)
--- 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 )
 
 #
 #

diff --git a/bin/tests/system/rsabigexponent/ns1/sign.sh b/bin/tests/system/rsabigexponent/ns1/sign.sh
index eadafebca7ff6ae49c6838ecfec9b51dd1bbbacd..c9a2c67fe39ea521a0816c2284bf554d22f186d5 100755 (executable)
--- 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

diff --git a/bin/tests/system/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh
index f1f51433cbf7d7aef3661f1d9ca38033ec6c62f9..5edcfe179ca49d71220f3b04f5fec4a2e9eda6f1 100644 (file)
--- 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

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 44b80b621c74f0ad07d89c9b73f30a89430aefa9..c76805db1494c43eacbbc40cd84dc392d4f62681 100644 (file)
--- 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
 

diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index 78969327a95455344f41e94331380acc09a53afb..69ea993efa7197b2a9eff915e2a4d9b65f0468b2 100644 (file)
--- 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"
 

diff --git a/bin/tests/system/setup.sh b/bin/tests/system/setup.sh
index 9d97c60e2f635042b4f9ea53df69e0b8dc6cc9a8..ef28f0f13cf0737802dd20d8ecb342bc095413d3 100644 (file)
--- 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
 
 

diff --git a/bin/tests/system/smartsign/prereq.sh b/bin/tests/system/smartsign/prereq.sh
index b9de2594b4bbbe5678e2e50086f923deb97f0181..84e71eb3a607467db284e862dbc46e8a04dbf860 100644 (file)
--- 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

diff --git a/bin/tests/system/smartsign/setup.sh b/bin/tests/system/smartsign/setup.sh
index 33c13101e3d56b0e3f7240131ce70160a6f79462..e786bc3d6a19838789fe06d40820ae8d59c10a68 100644 (file)
--- 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

diff --git a/bin/tests/system/staticstub/ns3/sign.sh b/bin/tests/system/staticstub/ns3/sign.sh
index 47aadf0f175d13bc2fbf2ba625412c2702fc7800..fb3c762cbeda7ec49eaaa301db4ddb06e9bb25d5 100755 (executable)
--- 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. .
 

diff --git a/bin/tests/system/staticstub/prereq.sh b/bin/tests/system/staticstub/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100755 (executable)
--- 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

diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh
index ae552e63244bea20a2bbe436da1e66c9d50699be..3c5edbd673bff40d56257a49e846b27cc5a2e187 100755 (executable)
--- 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

diff --git a/bin/tests/system/stress/tests.sh b/bin/tests/system/stress/tests.sh
index 4b8ff6af1cf093fda021b126e37c640b1aecca1a..4010d99a419c32904b5a73d07369e130021acd23 100644 (file)
--- 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

diff --git a/bin/tests/system/tkey/prereq.sh b/bin/tests/system/tkey/prereq.sh
index 0a5f897b6a692f5f49f8a93893e185d47cc0e5ac..359b89ab3c6f322c42235c1355682cd569275ae0 100644 (file)
--- 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

diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh
index 488b5952e1ef84f7870ccf02ced0ff43e9587136..231a3d0dfedd77a008575c076df85003ee39a700 100644 (file)
--- 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

diff --git a/bin/tests/system/tsiggss/prereq.sh b/bin/tests/system/tsiggss/prereq.sh
index a824dfe702d05f4954eee91877dc99f5b3f47f92..9b0e353dc8a2c7a00b50532531c6e6e9db323c14 100644 (file)
--- 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

diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh
index 765334d713a7bbd4f400434ac64539d3c4d1c1a9..65accdae485a2cdcf5505b239fb0174c50ae245a 100644 (file)
--- 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
 

diff --git a/bin/tests/system/unknown/prereq.sh b/bin/tests/system/unknown/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh
index ea635f44f2b8ec5a3f8f748a6aa7c531d73d9005..317b75c115bf037fb71a171f858418c30840c9b7 100644 (file)
--- 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)

diff --git a/bin/tests/system/verify/prereq.sh b/bin/tests/system/verify/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/verify/setup.sh b/bin/tests/system/verify/setup.sh
index 01a9643e4c5b6c17af6e94ea1955ecd64adb7e2d..d2be10df9db14e68e6a3c0821895b6243956b9e4 100644 (file)
--- 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)

diff --git a/bin/tests/system/wildcard/prereq.sh b/bin/tests/system/wildcard/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh
index 1720521e39150f25b9757623fa72e089a69880c0..e53233a991ed213c5adc8b512b775e75bc495f87 100644 (file)
--- 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)

diff --git a/bin/tests/system/xfer/setup.sh b/bin/tests/system/xfer/setup.sh
index 8b1cc22e49809d74a0e84dec8edeefe642f561ee..20fb12e72f396468bcaba042a1581ca66c5106a4 100644 (file)
--- 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

diff --git a/bin/tests/system/zero/setup.sh b/bin/tests/system/zero/setup.sh
index f5dd9c5f6e58b1d134ab88164e15009b220ca058..9f32e55eb585ddacda7b43c6e6cbecef14e3814e 100644 (file)
--- 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

diff --git a/bin/tests/system/zonechecks/prereq.sh b/bin/tests/system/zonechecks/prereq.sh
index d90b9b27259cbd62de4caa3196d4ae56792ba4c1..582c6ba6a7bb04dfc20e07faaeb69cf6bbf93ed9 100644 (file)
--- 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

diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh
index 713903270bbb5a3f47fd011c7cc6e16f14f4044d..3ee7aca47418bc715d12fa4b81dd01715f1c0dd3 100644 (file)
--- 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