ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

3099. [test] "dlz" system test now runs but gives R:SKIPPED if

Browse Source 
not compiled with --with-dlz-filesystem.  [RT #24146]
This commit is contained in:
Evan Hunt
2011-04-19 22:32:24 +00:00
parent e89954332f
commit 882ab80d57
6 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGES
+3
View File
@@ -1,3 +1,6 @@
3099. [test] "dlz" system test now runs but gives R:SKIPPED if
not compiled with --with-dlz-filesystem. [RT #24146]
3097. [test] Add a tool to test handling of malformed packets.
[RT #24096]
bin/tests/system/conf.sh.in
+2 -2
View File
@@ -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.18 2011/04/05 23:15:20 each Exp $
# $Id: conf.sh.in,v 1.43.8.19 2011/04/19 22:32:23 each Exp $
#
# Common configuration data for system tests, to be sourced into
@@ -53,7 +53,7 @@ JOURNALPRINT=$TOP/bin/tools/named-journalprint
# load on the machine to make it unusable to other users.
# v6synth
SUBDIRS="acl allow_query addzone autosign cacheclean checkconf
checknames checkzone database dlv dlvauto @DLZ_SYSTEM_TEST@
checknames checkzone database dlv dlvauto dlz
dname dnssec forward glue ixfr limits logfileconfig lwresd
masterfile masterformat metadata notify nsupdate pending
pkcs11 resolver rrsetorder sortlist smartsign stub tkey
bin/tests/system/dlz/prereq.sh.in
+25
View File
@@ -0,0 +1,25 @@
#!/bin/sh
#
# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
#
# Permission to use, copy, modify, and/or distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: prereq.sh.in,v 1.2.4.2 2011/04/19 22:32:23 each Exp $
TOP=${SYSTEMTESTTOP:=.}/../../../..
if [ "@DLZ_SYSTEM_TEST@" != "filesystem" ]; then
echo "I:DLZ filesystem driver not supported"
exit 255
fi
exit 0
bin/tests/system/dlz/tests.sh
+2 -1
View File
@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: tests.sh,v 1.2.2.2 2010/08/16 05:14:14 marka Exp $
# $Id: tests.sh,v 1.2.2.3 2011/04/19 22:32:23 each Exp $
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
@@ -35,6 +35,7 @@ $DIG $DIGOPTS +norec foo.example.com. \
grep "status: NOERROR" dig.out.ns1.test$n > /dev/null || ret=1
grep "example.com..*DNAME.*example.net." dig.out.ns1.test$n > /dev/null || ret=1
grep "foo.example.com..*CNAME.*foo.example.net." dig.out.ns1.test$n > /dev/null || ret=1
grep "flags:[^;]* aa[ ;]" dig.out.ns1.test$n > /dev/null || ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
configure.in
+2 -1
View File
@@ -18,7 +18,7 @@ AC_DIVERT_PUSH(1)dnl
esyscmd([sed "s/^/# /" COPYRIGHT])dnl
AC_DIVERT_POP()dnl
AC_REVISION($Revision: 1.489.22.19 $)
AC_REVISION($Revision: 1.489.22.20 $)
AC_INIT(lib/dns/name.c)
AC_PREREQ(2.59)
@@ -3316,6 +3316,7 @@ AC_CONFIG_FILES([
bin/tests/sockaddr/Makefile
bin/tests/system/Makefile
bin/tests/system/conf.sh
bin/tests/system/dlz/prereq.sh
bin/tests/system/filter-aaaa/Makefile
bin/tests/system/lwresd/Makefile
bin/tests/system/tkey/Makefile
contrib/dlz/config.dlz.in
+1 -1
View File
@@ -339,7 +339,7 @@ case "$use_dlz_filesystem" in
;;
*)
DLZ_ADD_DRIVER(FILESYSTEM, dlz_filesystem_driver)
DLZ_SYSTEM_TEST=dlz
DLZ_SYSTEM_TEST=filesystem
AC_MSG_RESULT(yes)
;;
esac