...
 
Commits (3)
......@@ -107,7 +107,7 @@ parallel.mk:
# Targets to run the tests.
test: parallel.mk subdirs
test: parallel.mk
@$(MAKE) -f parallel.mk check
@$(SHELL) ./runsequential.sh -r
@$(SHELL) ./testsummary.sh
......
......@@ -15,10 +15,13 @@
#
# Find the top of the BIND9 tree.
TOP=${SYSTEMTESTTOP:=.}/../../..
TOP=@abs_top_builddir@
SRCTOP=@abs_top_srcdir@
SYSTEMTESTTOP=@abs_srcdir@
# Make it absolute so that it continues to work after we cd.
TOP=`cd $TOP && pwd`
export TOP
export SRCTOP
export SYSTEMTESTTOP
ARPANAME=$TOP/bin/tools/arpaname
CDS=$TOP/bin/dnssec/dnssec-cds
......@@ -161,7 +164,7 @@ HAVEJSONSTATS=@JSONSTATS@
ZLIB=@ZLIB@
NZD=@NZD_TOOLS@
. ${TOP}/version
. $SRCTOP/version
#
# Set up color-coded test output
......@@ -267,6 +270,9 @@ nextpart () {
# environment variables. (These values are set by "run.sh", which calls the
# scripts invoking this function.)
#
# For use in tests that need to locate files in other parts of the
# tree, we also replace @TOP@, @SRCTOP@, and @SYSTEMTESTTOP@.
#
# Usage:
# copy_setports infile outfile
......@@ -280,7 +286,10 @@ copy_setports() {
-e "s/@EXTRAPORT6@/${EXTRAPORT6}/g" \
-e "s/@EXTRAPORT7@/${EXTRAPORT7}/g" \
-e "s/@EXTRAPORT8@/${EXTRAPORT8}/g" \
-e "s/@CONTROLPORT@/${CONTROLPORT}/g" $1 > $2
-e "s/@CONTROLPORT@/${CONTROLPORT}/g" \
-e "s#@TOP@#${TOP}#g" \
-e "s#@SRCTOP@#${SRCTOP}#g" \
-e "s#@SYSTEMTESTTOP@#${SYSTEMTESTTOP}#g" $1 > $2
}
#
......
......@@ -18,10 +18,14 @@
CYGWIN=1
# Find the top of the BIND9 tree.
TOP=${SYSTEMTESTTOP:=.}/../../..
TOP=@abs_top_builddir@
SRCTOP=@abs_top_srcdir@
SYSTEMTESTTOP=@abs_srcdir@
export TOP
export SRCTOP
export SYSTEMTESTTOP
# Make it absolute so that it continues to work after we cd.
TOP=`cd $TOP && pwd`
# Visual Studio build configurations are Release and Debug
VSCONF=Debug
......@@ -263,7 +267,10 @@ copy_setports() {
-e "s/${atsign}EXTRAPORT6${atsign}/${EXTRAPORT6}/g" \
-e "s/${atsign}EXTRAPORT7${atsign}/${EXTRAPORT7}/g" \
-e "s/${atsign}EXTRAPORT8${atsign}/${EXTRAPORT8}/g" \
-e "s/${atsign}CONTROLPORT${atsign}/${CONTROLPORT}/g" $1 > $2
-e "s/${atsign}CONTROLPORT${atsign}/${CONTROLPORT}/g" \
-e "s#${atsign}TOP${atsign}#${TOP}#g" \
-e "s#${atsign}SRCTOP${atsign}#${SRCTOP}#g" \
-e "s#${atsign}SYSTEMTESTTOP${atsign}#${SYSTEMTESTTOP}#g" $1 > $2
}
#
......
......@@ -33,5 +33,5 @@ controls {
inet 10.53.0.1 port @CONTROLPORT@ allow { any; } keys { rndc_key; };
};
dyndb sample "../driver/lib/sample.so" { ipv4.example.nil. in-addr.arpa. };
dyndb sample2 "../driver/lib/sample.so" { ipv6.example.nil. 8.b.d.0.1.0.0.2.ip6.arpa. };
dyndb sample "@TOP@/bin/tests/system/dyndb/driver/lib/sample.so" { ipv4.example.nil. in-addr.arpa. };
dyndb sample2 "@TOP@/bin/tests/system/dyndb/driver/lib/sample.so" { ipv6.example.nil. 8.b.d.0.1.0.0.2.ip6.arpa. };
......@@ -9,8 +9,10 @@
# information regarding copyright ownership.
############################################################################
import sys
sys.path.insert(0, '../../../python')
import sys, os
try: pdir = os.environ['TOP'] + '/bin/python'
except: pdir = '../../../python'
sys.path.insert(0, pdir)
from isc import *
pp = policy.dnssec_policy()
......
......@@ -620,8 +620,10 @@ if [ -x "$PYTHON" ]; then
echo_i "test rndc python bindings ($n)"
ret=0
$PYTHON > python.out.1.test$n << EOF
import sys
sys.path.insert(0, '../../../../bin/python')
import sys, os
try: pdir = os.environ['TOP'] + '/bin/python'
except: pdir = '../../../python'
sys.path.insert(0, pdir)
from isc import *
r = rndc(('10.53.0.5', ${CONTROLPORT}), 'hmac-sha256', '1234abcd8765')
result = r.call('status')
......