update to 9.7.2rc1

[tridge/bind9.git] / bin / tests / system / conf.sh.in

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 73b0942ce26041bf4187a2494e096a8d77873ef3..df26dd9ddaaf1356b533c1bd712b05cbf3bc2cd5 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -15,7 +15,7 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: conf.sh.in,v 1.43.8.3 2010/05/26 06:30:43 marka Exp $
+# $Id: conf.sh.in,v 1.43.8.8 2010/08/16 05:14:14 marka Exp $
 
 #
 # Common configuration data for system tests, to be sourced into
@@ -37,23 +37,39 @@ RNDC=$TOP/bin/rndc/rndc
 NSUPDATE=$TOP/bin/nsupdate/nsupdate
 DDNSCONFGEN=$TOP/bin/confgen/ddns-confgen
 KEYGEN=$TOP/bin/dnssec/dnssec-keygen
+KEYFRLAB=$TOP/bin/dnssec/dnssec-keyfromlabel
 SIGNER=$TOP/bin/dnssec/dnssec-signzone
 REVOKE=$TOP/bin/dnssec/dnssec-revoke
 SETTIME=$TOP/bin/dnssec/dnssec-settime
 DSFROMKEY=$TOP/bin/dnssec/dnssec-dsfromkey
 CHECKZONE=$TOP/bin/check/named-checkzone
 CHECKCONF=$TOP/bin/check/named-checkconf
+PK11GEN="$TOP/bin/pkcs11/pkcs11-keygen -s 0 -p 1234"
+PK11LIST="$TOP/bin/pkcs11/pkcs11-list -s 0 -p 1234"
+PK11DEL="$TOP/bin/pkcs11/pkcs11-destroy -s 0 -p 1234"
 
 # The "stress" test is not run by default since it creates enough
 # load on the machine to make it unusable to other users.
 # v6synth
-SUBDIRS="acl autosign cacheclean checkconf checknames dlv dnssec forward glue
-    ixfr limits lwresd masterfile masterformat metadata notify nsupdate pending 
-    resolver rrsetorder sortlist smartsign stub tkey unknown upforwd views
-    xfer xferquota zonechecks"
+SUBDIRS="acl addzone autosign cacheclean checkconf checknames
+    dlv @DLZ_SYSTEM_TEST@ dnssec forward glue ixfr limits lwresd
+    masterfile masterformat metadata notify nsupdate pending pkcs11
+    resolver rrsetorder sortlist smartsign stub tkey unknown upforwd
+    views xfer xferquota zonechecks"
 
 # PERL will be an empty string if no perl interpreter was found.
 PERL=@PERL@
+if test -n "$PERL"
+then
+       if $PERL -e "use IO::Socket::INET6;" 2> /dev/null
+       then
+               TESTSOCK6="$PERL $TOP/bin/tests/system/testsock6.pl"
+       else
+               TESTSOCK6=false
+       fi
+else
+       TESTSOCK6=false
+fi
 
-export NAMED LWRESD DIG NSUPDATE KEYGEN SIGNER KEYSIGNER KEYSETTOOL PERL \
-    SUBDIRS RNDC CHECKZONE
+export NAMED LWRESD DIG NSUPDATE KEYGEN KEYFRLAB SIGNER KEYSIGNER KEYSETTOOL \
+       PERL SUBDIRS RNDC CHECKZONE PK11GEN PK11LIST PK11DEL TESTSOCK6