Commit 60988462 authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] use posix-compatible shell in system tests

3839.	[test]		Use only posix-compatible shell in system tests.
			[RT #35625]
parent 215f02a1
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
......
......@@ -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
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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
......@@ -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"
......
......@@ -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
......@@ -19,7 +19,7 @@ SYSTEMTESTTOP=..
KEYGEN="$KEYGEN -qr $RANDFILE"
sh clean.sh
$SHELL clean.sh
ln -s $CHECKZONE named-compilezone
......
......@@ -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
......
......@@ -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
......
......@@ -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=
......
......@@ -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
......@@ -19,4 +19,4 @@ SYSTEMTESTTOP=..
test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
(cd ns1 && sh -e sign.sh)
(cd ns1 && $SHELL -e sign.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
......@@ -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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment