]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
move all optional tests from bin/tests to bin/tests/optional
authorEvan Hunt <each@isc.org>
Tue, 27 Feb 2018 20:48:10 +0000 (12:48 -0800)
committerEvan Hunt <each@isc.org>
Sat, 10 Mar 2018 02:29:52 +0000 (18:29 -0800)
- some of these tests are obsolete and should be cleared up,
  others overlap with ATF tests and may be removed later.
  for now, let's just tidy up the bin/tests directory by
  moving these files down a level.

(cherry picked from commit 344ab0eb7d316bf9c2701208d3d22ddea4510781)
(cherry picked from commit dafdf2c09bff7d95621502c249894248a90c1a6e)
(cherry picked from commit e062109659f53ea64acf8346ea4711fa8340b5c9)

52 files changed:
bin/tests/.gitignore
bin/tests/Makefile.in
bin/tests/dst/Makefile.in
bin/tests/ndc.conf [deleted file]
bin/tests/ndc.conf-include [deleted file]
bin/tests/optional/Kchild.example.+003+04017.key [moved from bin/tests/Kchild.example.+003+04017.key with 100% similarity]
bin/tests/optional/Kchild.example.+003+04017.private [moved from bin/tests/Kchild.example.+003+04017.private with 100% similarity]
bin/tests/optional/Makefile.in [new file with mode: 0644]
bin/tests/optional/adb_test.c [moved from bin/tests/adb_test.c with 99% similarity]
bin/tests/optional/backtrace_test.c [moved from bin/tests/backtrace_test.c with 97% similarity]
bin/tests/optional/byaddr_test.c [moved from bin/tests/byaddr_test.c with 99% similarity]
bin/tests/optional/byname_test.c [moved from bin/tests/byname_test.c with 100% similarity]
bin/tests/optional/db_test.c [moved from bin/tests/db_test.c with 99% similarity]
bin/tests/optional/dst_test.c [moved from bin/tests/dst/dst_test.c with 99% similarity]
bin/tests/optional/entropy2_test.c [moved from bin/tests/entropy2_test.c with 98% similarity]
bin/tests/optional/entropy_test.c [moved from bin/tests/entropy_test.c with 98% similarity]
bin/tests/optional/fsaccess_test.c [moved from bin/tests/fsaccess_test.c with 96% similarity]
bin/tests/optional/gsstest.c [moved from bin/tests/dst/gsstest.c with 100% similarity]
bin/tests/optional/gxba_test.c [moved from bin/tests/gxba_test.c with 97% similarity]
bin/tests/optional/gxbn_test.c [moved from bin/tests/gxbn_test.c with 97% similarity]
bin/tests/optional/hash_test.c [moved from bin/tests/hash_test.c with 99% similarity]
bin/tests/optional/inter_test.c [moved from bin/tests/inter_test.c with 100% similarity]
bin/tests/optional/keyboard_test.c [moved from bin/tests/keyboard_test.c with 96% similarity]
bin/tests/optional/lex_test.c [moved from bin/tests/lex_test.c with 98% similarity]
bin/tests/optional/lfsr_test.c [moved from bin/tests/lfsr_test.c with 97% similarity]
bin/tests/optional/log_test.c [moved from bin/tests/log_test.c with 99% similarity]
bin/tests/optional/lwres_test.c [moved from bin/tests/lwres_test.c with 99% similarity]
bin/tests/optional/lwresconf_test.c [moved from bin/tests/lwresconf_test.c with 97% similarity]
bin/tests/optional/master_test.c [moved from bin/tests/master_test.c with 97% similarity]
bin/tests/optional/mempool_test.c [moved from bin/tests/mempool_test.c with 97% similarity]
bin/tests/optional/name_test.c [moved from bin/tests/name_test.c with 100% similarity]
bin/tests/optional/nsecify.c [moved from bin/tests/nsecify.c with 98% similarity]
bin/tests/optional/ratelimiter_test.c [moved from bin/tests/ratelimiter_test.c with 98% similarity]
bin/tests/optional/rbt_test.c [moved from bin/tests/rbt_test.c with 99% similarity]
bin/tests/optional/rbt_test.out [moved from bin/tests/rbt_test.out with 100% similarity]
bin/tests/optional/rbt_test.txt [moved from bin/tests/rbt_test.txt with 95% similarity]
bin/tests/optional/rwlock_test.c [moved from bin/tests/rwlock_test.c with 98% similarity]
bin/tests/optional/serial_test.c [moved from bin/tests/serial_test.c with 95% similarity]
bin/tests/optional/shutdown_test.c [moved from bin/tests/shutdown_test.c with 98% similarity]
bin/tests/optional/sig0_test.c [moved from bin/tests/sig0_test.c with 99% similarity]
bin/tests/optional/sock_test.c [moved from bin/tests/sock_test.c with 99% similarity]
bin/tests/optional/sym_test.c [moved from bin/tests/sym_test.c with 98% similarity]
bin/tests/optional/task_test.c [moved from bin/tests/task_test.c with 98% similarity]
bin/tests/optional/timer_test.c [moved from bin/tests/timer_test.c with 98% similarity]
bin/tests/optional/zone_test.c [moved from bin/tests/zone_test.c with 99% similarity]
bin/tests/t_api.pl [deleted file]
bin/tests/testdata/wire/wire_test.data [moved from bin/tests/wire_test.data with 100% similarity]
bin/tests/testdata/wire/wire_test.data2 [moved from bin/tests/wire_test.data2 with 100% similarity]
bin/tests/testdata/wire/wire_test.data3 [moved from bin/tests/wire_test.data3 with 100% similarity]
bin/tests/testdata/wire/wire_test.data4 [moved from bin/tests/wire_test.data4 with 100% similarity]
configure
configure.in

index 95cbf67820d21e36cfc937a272578732b4408a9f..68c70b00823b1116a4885316980059887a28a7ad 100644 (file)
@@ -3,7 +3,6 @@ genrandom
 headerdep_test.sh
 nxtify
 sdig
-t_journal
 *_test
 t_atomic
 t_db
index 3e9205a817088ec25ed79f5e8f4344ba8a84d058..ce68807f302d5ce23cb5a3d1964e3c6b97283986 100644 (file)
@@ -20,7 +20,7 @@ top_srcdir =  @top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
-               ${LWRES_INCLUDES} ${BIND9_INCLUDES} @DST_OPENSSL_INC@
+               ${BIND9_INCLUDES} @DST_OPENSSL_INC@
 
 CDEFINES =     @CRYPTO@
 CWARNINGS =
@@ -31,277 +31,38 @@ DNSLIBS =  ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
 ISCLIBS =      ../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
 ISCNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@
 ISCCFGLIBS =   ../../lib/isccfg/libisccfg.@A@
-LWRESLIBS =    ../../lib/lwres/liblwres.@A@
 
 BIND9DEPLIBS = ../../lib/bind9/libbind9.@A@
 DNSDEPLIBS =   ../../lib/dns/libdns.@A@
 ISCDEPLIBS =   ../../lib/isc/libisc.@A@
 ISCDEPNOSYMLIBS = ../../lib/isc/libisc-nosymtbl.@A@
 ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
-LWRESDEPLIBS = ../../lib/lwres/liblwres.@A@
 
 LIBS =         @LIBS@
 
 SUBDIRS =      atomic db dst master mem hashes names net rbt resolver \
-               sockaddr tasks timers system @PKCS11_TOOLS@
+               sockaddr tasks timers system @PKCS11_TOOLS@ optional
 
 # Test programs that are built by default:
 # cfg_test is needed for regenerating doc/misc/options
 # makejournal is needed by system tests
+# wire_test is needed for fuzz testing
+# other opptional test programs have been moved to ./optional
 
 # Alphabetically
-TARGETS =      @XTARGETS@ cfg_test@EXEEXT@ makejournal@EXEEXT@ \
-               mdig@EXEEXT@ wire_test@EXEEXT@
+TARGETS =      cfg_test@EXEEXT@ makejournal@EXEEXT@ \
+               wire_test@EXEEXT@
 
-# All the other tests are optional and not built by default.
-
-# Alphabetically
-XTARGETS =     adb_test@EXEEXT@ \
-               byaddr_test@EXEEXT@ \
-               backtrace_test@EXEEXT@ \
-               backtrace_test_nosymtbl@EXEEXT@ \
-               byname_test@EXEEXT@ \
-               compress_test@EXEEXT@ \
-               db_test@EXEEXT@ \
-               entropy_test@EXEEXT@ \
-               entropy2_test@EXEEXT@ \
-               gxba_test@EXEEXT@ \
-               gxbn_test@EXEEXT@ \
-               hash_test@EXEEXT@ \
-               fsaccess_test@EXEEXT@ \
-               inter_test@EXEEXT@ \
-               keyboard_test@EXEEXT@ \
-               lex_test@EXEEXT@ \
-               lfsr_test@EXEEXT@ \
-               log_test@EXEEXT@ \
-               lwres_test@EXEEXT@ \
-               lwresconf_test@EXEEXT@ \
-               master_test@EXEEXT@ \
-               mempool_test@EXEEXT@ \
-               name_test@EXEEXT@ \
-               nsecify@EXEEXT@ \
-               ratelimiter_test@EXEEXT@ \
-               rbt_test@EXEEXT@ \
-               rwlock_test@EXEEXT@ \
-               serial_test@EXEEXT@ \
-               shutdown_test@EXEEXT@ \
-               sig0_test@EXEEXT@ \
-               sock_test@EXEEXT@ \
-               sym_test@EXEEXT@ \
-               task_test@EXEEXT@ \
-               timer_test@EXEEXT@ \
-               wire_test@EXEEXT@ \
-               zone_test@EXEEXT@
-
-# Alphabetically
-SRCS =         cfg_test.c makejournal.c mdig.c wire_test.c ${XSRCS}
-
-XSRCS =                adb_test.c \
-               byaddr_test.c \
-               backtrace_test.c \
-               byname_test.c \
-               compress_test.c \
-               db_test.c \
-               entropy_test.c \
-               entropy2_test.c \
-               gxba_test.c \
-               gxbn_test.c \
-               hash_test.c \
-               fsaccess_test.c \
-               inter_test.c \
-               keyboard_test.c \
-               lex_test.c \
-               lfsr_test.c \
-               log_test.c \
-               lwres_test.c \
-               lwresconf_test.c \
-               master_test.c \
-               mempool_test.c \
-               name_test.c \
-               nsecify.c \
-               ratelimiter_test.c \
-               rbt_test.c \
-               rwlock_test.c \
-               serial_test.c \
-               shutdown_test.c \
-               sig0_test.c \
-               sock_test.c \
-               sym_test.c \
-               task_test.c \
-               timer_test.c \
-               wire_test.c \
-               zone_test.c
+SRCS =         cfg_test.c makejournal.c wire_test.c
 
 @BIND9_MAKE_RULES@
 
-# disable optimization for backtrace test to get the expected result
-BTTEST_CFLAGS =        ${BACKTRACECFLAGS} ${EXT_CFLAGS} ${ALL_CPPFLAGS} -g \
-               ${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
-
-all_tests: ${XTARGETS}
-
-adb_test@EXEEXT@: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ adb_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-backtrace_test_nosymtbl@EXEEXT@: ${srcdir}/backtrace_test.c ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} -o $@ \
-       ${srcdir}/backtrace_test.c ${ISCLIBS} ${LIBS}
-
-backtrace_test@EXEEXT@: ${srcdir}/backtrace_test.c backtrace_test_nosymtbl@EXEEXT@
-       #first step: create a first symbol table
-       rm -f symtbl.c
-       if test X${MKSYMTBL_PROGRAM} != X; then \
-       ${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
-       backtrace_test_nosymtbl@EXEEXT@; else \
-       cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
-       #second step: build a binary with the first symbol table
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
-       -o $@0 ${srcdir}/backtrace_test.c symtbl.c \
-       ${ISCNOSYMLIBS} ${LIBS}
-       rm -f symtbl.c
-       #third step: create a second symbol table
-       if test X${MKSYMTBL_PROGRAM} != X; then \
-       ${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl $@0; else \
-       cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
-       #fourth step: build the final binary
-       rm -f $@0
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
-       -o $@ ${srcdir}/backtrace_test.c symtbl.c ${ISCNOSYMLIBS} ${LIBS}
-       rm -f symtbl.c
-
-nsecify@EXEEXT@: nsecify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsecify.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-byaddr_test@EXEEXT@: byaddr_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byaddr_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-byname_test@EXEEXT@: byname_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byname_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lex_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-lfsr_test@EXEEXT@: lfsr_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lfsr_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-log_test@EXEEXT@: log_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ log_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-name_test@EXEEXT@: name_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ name_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ hash_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-entropy_test@EXEEXT@: entropy_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-entropy2_test@EXEEXT@: entropy2_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy2_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-sock_test@EXEEXT@: sock_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sock_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-sym_test@EXEEXT@: sym_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sym_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-task_test@EXEEXT@: task_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ task_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-shutdown_test@EXEEXT@: shutdown_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ shutdown_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-timer_test@EXEEXT@: timer_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ timer_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-ratelimiter_test@EXEEXT@: ratelimiter_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ratelimiter_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-rbt_test@EXEEXT@: rbt_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rbt_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-rwlock_test@EXEEXT@: rwlock_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rwlock_test.@O@ \
-               ${ISCLIBS} ${LIBS}
+all_tests: subdirs
 
 wire_test@EXEEXT@: wire_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ wire_test.@O@ \
                ${DNSLIBS} ${ISCLIBS} ${LIBS}
 
-master_test@EXEEXT@: master_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ master_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-db_test@EXEEXT@: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ db_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-compress_test@EXEEXT@: compress_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ compress_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-mempool_test@EXEEXT@: mempool_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ mempool_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-serial_test@EXEEXT@: serial_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ serial_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-zone_test@EXEEXT@: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
-fsaccess_test@EXEEXT@: fsaccess_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ fsaccess_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-inter_test@EXEEXT@: inter_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ inter_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-keyboard_test@EXEEXT@: keyboard_test.@O@ ${ISCDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ keyboard_test.@O@ \
-               ${ISCLIBS} ${LIBS}
-
-lwresconf_test@EXEEXT@: lwresconf_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lwresconf_test.@O@ \
-               ${LWRESLIBS} ${ISCLIBS} ${LIBS}
-
-lwres_test@EXEEXT@: lwres_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lwres_test.@O@ \
-               ${LWRESLIBS} ${ISCLIBS} ${LIBS}
-
-gxbn_test@EXEEXT@: gxbn_test.@O@ ${LWRESDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ gxbn_test.@O@ \
-               ${LWRESLIBS} ${ISCLIBS} ${LIBS}
-
-gxba_test@EXEEXT@: gxba_test.@O@ ${LWRESDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ gxba_test.@O@ \
-               ${LWRESLIBS} ${ISCLIBS} ${LIBS}
-
-sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sig0_test.@O@ \
-               ${DNSLIBS} ${ISCLIBS} ${LIBS}
-
 cfg_test@EXEEXT@: cfg_test.@O@ ${ISCCFGDEPLIBS} ${ISCDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ cfg_test.@O@ \
                ${ISCCFGLIBS} ${DNSLIBS} ${ISCLIBS} ${LIBS}
@@ -318,9 +79,7 @@ distclean::
        rm -f headerdep_test.sh
 
 clean distclean::
-       rm -f ${TARGETS} ${XTARGETS}
-       rm -f t_journal
-       rm -f backtrace_test_symtbl.c
+       rm -f ${TARGETS}
 
 check: test
 
index fea99391dc2e5e7df744e701a187c8ef2e375707..b8dcd455c17602eb62c95657ddb0ad433abc253a 100644 (file)
@@ -13,8 +13,6 @@
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: Makefile.in,v 1.52 2010/12/24 23:47:05 tbox Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -22,9 +20,9 @@ top_srcdir =  @top_srcdir@
 @BIND9_MAKE_INCLUDES@
 
 CINCLUDES =    ${TEST_INCLUDES} ${DNS_INCLUDES} \
-               ${ISC_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
+               ${ISC_INCLUDES} @DST_OPENSSL_INC@
 
-CDEFINES =     @CRYPTO@ @USE_GSSAPI@
+CDEFINES =     @CRYPTO@
 CWARNINGS =
 
 DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
@@ -39,24 +37,16 @@ LIBS =              ${DNSLIBS} ${ISCLIBS} @LIBS@
 
 TLIB =         ../../../lib/tests/libt_api.@A@
 
-TARGETS =      dst_test@EXEEXT@ t_dst@EXEEXT@ gsstest@EXEEXT@
+TARGETS =      t_dst@EXEEXT@
 
-SRCS =         dst_test.c t_dst.c gsstest.c
+SRCS =         t_dst.c
 
 @BIND9_MAKE_RULES@
 
-dst_test@EXEEXT@: dst_test.@O@ ${DEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-               dst_test.@O@ ${LIBS}
-
 t_dst@EXEEXT@: t_dst.@O@ ${DEPLIBS} ${TLIB}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
                t_dst.@O@ ${TLIB} ${LIBS}
 
-gsstest@EXEEXT@: gsstest.@O@ ${DEPLIBS}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-               gsstest.@O@ ${LIBS}
-
 test: t_dst@EXEEXT@ randomfile
        ../../tools/genrandom@EXEEXT@ 100 randomfile
        -@ ./t_dst@EXEEXT@ -q 1800 -a
diff --git a/bin/tests/ndc.conf b/bin/tests/ndc.conf
deleted file mode 100644 (file)
index bc2c0c6..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2000, 2001  Internet Software Consortium.
- *
- * 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: ndc.conf,v 1.11 2007/06/19 23:46:59 tbox Exp $ */
-
-options {
-       default-server  "velo.jab.fr" ;
-#      [ default-key key_name; ]
-};
-
-server "velo.jab.fr" {
-       key "akey";
-       host "1.2.3.4";
-};
-
-include "ndc.conf-include";
-
-key "akey" {
-       algorithm "algo";
-       secret  "c2Vj";
-};
-
diff --git a/bin/tests/ndc.conf-include b/bin/tests/ndc.conf-include
deleted file mode 100644 (file)
index 58d1534..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2004, 2007  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 2001  Internet Software Consortium.
- *
- * 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: ndc.conf-include,v 1.6 2007/06/19 23:46:59 tbox Exp $ */
-
-key "another-key" {
-        algorithm "al-gore-rhythm";
-        secret "R29yZSBpbiAyMDA0IQo"; # "Gore in 2004!"
-};
-
-
diff --git a/bin/tests/optional/Makefile.in b/bin/tests/optional/Makefile.in
new file mode 100644 (file)
index 0000000..4442a80
--- /dev/null
@@ -0,0 +1,299 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+srcdir =       @srcdir@
+VPATH =                @srcdir@
+top_srcdir =   @top_srcdir@
+
+@BIND9_MAKE_INCLUDES@
+
+CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${ISCCFG_INCLUDES} \
+               ${LWRES_INCLUDES} @DST_OPENSSL_INC@ @DST_GSSAPI_INC@
+
+CDEFINES =     @CRYPTO@ @USE_GSSAPI@
+
+CWARNINGS =
+BACKTRACECFLAGS = @BACKTRACECFLAGS@
+
+DNSLIBS =      ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@
+ISCLIBS =      ../../../lib/isc/libisc.@A@ @ISC_OPENSSL_LIBS@
+ISCNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@ @ISC_OPENSSL_LIBS@
+ISCCFGLIBS =   ../../../lib/isccfg/libisccfg.@A@
+LWRESDEPLIBS = ../../../lib/lwres/liblwres.@A@
+
+DNSDEPLIBS =   ../../../lib/dns/libdns.@A@
+ISCDEPLIBS =   ../../../lib/isc/libisc.@A@
+ISCDEPNOSYMLIBS = ../../../lib/isc/libisc-nosymtbl.@A@
+ISCCFGDEPLIBS = ../../../lib/isccfg/libisccfg.@A@
+LWRESLIBS =    ../../../lib/lwres/liblwres.@A@
+
+LIBS =         @LIBS@
+
+SUBDIRS =
+
+# These programs are not built by default, but only when
+# configured with --enable-developer or built explicitly with
+# "make all_tests"
+
+TARGETS =      @XTARGETS@
+XTARGETS =     adb_test@EXEEXT@ \
+               byaddr_test@EXEEXT@ \
+               backtrace_test@EXEEXT@ \
+               backtrace_test_nosymtbl@EXEEXT@ \
+               byname_test@EXEEXT@ \
+               db_test@EXEEXT@ \
+               dst_test@EXEEXT@ \
+               entropy_test@EXEEXT@ \
+               entropy2_test@EXEEXT@ \
+               gsstest@EXEEXT@ \
+               gxba_test@EXEEXT@ \
+               gxbn_test@EXEEXT@ \
+               hash_test@EXEEXT@ \
+               fsaccess_test@EXEEXT@ \
+               inter_test@EXEEXT@ \
+               keyboard_test@EXEEXT@ \
+               lex_test@EXEEXT@ \
+               lfsr_test@EXEEXT@ \
+               log_test@EXEEXT@ \
+               lwres_test@EXEEXT@ \
+               lwresconf_test@EXEEXT@ \
+               master_test@EXEEXT@ \
+               mempool_test@EXEEXT@ \
+               name_test@EXEEXT@ \
+               nsecify@EXEEXT@ \
+               ratelimiter_test@EXEEXT@ \
+               rbt_test@EXEEXT@ \
+               rwlock_test@EXEEXT@ \
+               serial_test@EXEEXT@ \
+               shutdown_test@EXEEXT@ \
+               sig0_test@EXEEXT@ \
+               sock_test@EXEEXT@ \
+               sym_test@EXEEXT@ \
+               task_test@EXEEXT@ \
+               timer_test@EXEEXT@ \
+               zone_test@EXEEXT@
+
+SRCS =         ${XSRCS}
+XSRCS =                adb_test.c \
+               byaddr_test.c \
+               backtrace_test.c \
+               byname_test.c \
+               db_test.c \
+               dst_test.c \
+               entropy_test.c \
+               entropy2_test.c \
+               hash_test.c \
+               fsaccess_test.c \
+               gsstest.c \
+               gxba_test.c \
+               gxbn_test.c \
+               inter_test.c \
+               keyboard_test.c \
+               lex_test.c \
+               lfsr_test.c \
+               log_test.c \
+               lwres_test.c \
+               lwresconf_test.c \
+               master_test.c \
+               mempool_test.c \
+               name_test.c \
+               nsecify.c \
+               ratelimiter_test.c \
+               rbt_test.c \
+               rwlock_test.c \
+               serial_test.c \
+               shutdown_test.c \
+               sig0_test.c \
+               sock_test.c \
+               sym_test.c \
+               task_test.c \
+               timer_test.c \
+               zone_test.c
+
+@BIND9_MAKE_RULES@
+
+# disable optimization for backtrace test to get the expected result
+BTTEST_CFLAGS =        ${BACKTRACECFLAGS} ${EXT_CFLAGS} ${ALL_CPPFLAGS} -g \
+               ${ALWAYS_WARNINGS} ${STD_CWARNINGS} ${CWARNINGS}
+
+all_tests: ${XTARGETS}
+
+adb_test@EXEEXT@: adb_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ adb_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+backtrace_test_nosymtbl@EXEEXT@: ${srcdir}/backtrace_test.c ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} -o $@ \
+       ${srcdir}/backtrace_test.c ${ISCLIBS} ${LIBS}
+
+backtrace_test@EXEEXT@: ${srcdir}/backtrace_test.c backtrace_test_nosymtbl@EXEEXT@
+       #first step: create a first symbol table
+       rm -f symtbl.c
+       if test X${MKSYMTBL_PROGRAM} != X; then \
+       ${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl \
+       backtrace_test_nosymtbl@EXEEXT@; else \
+       cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
+       #second step: build a binary with the first symbol table
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
+       -o $@0 ${srcdir}/backtrace_test.c symtbl.c \
+       ${ISCNOSYMLIBS} ${LIBS}
+       rm -f symtbl.c
+       #third step: create a second symbol table
+       if test X${MKSYMTBL_PROGRAM} != X; then \
+       ${MKSYMTBL_PROGRAM} ${top_srcdir}/util/mksymtbl.pl $@0; else \
+       cp ${top_srcdir}/lib/isc/backtrace-emptytbl.c symtbl.c; fi
+       #fourth step: build the final binary
+       rm -f $@0
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${BTTEST_CFLAGS} ${LDFLAGS} \
+       -o $@ ${srcdir}/backtrace_test.c symtbl.c ${ISCNOSYMLIBS} ${LIBS}
+       rm -f symtbl.c
+
+nsecify@EXEEXT@: nsecify.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ nsecify.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+byaddr_test@EXEEXT@: byaddr_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byaddr_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+byname_test@EXEEXT@: byname_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ byname_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+lex_test@EXEEXT@: lex_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lex_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+lfsr_test@EXEEXT@: lfsr_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lfsr_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+log_test@EXEEXT@: log_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ log_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+name_test@EXEEXT@: name_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ name_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+hash_test@EXEEXT@: hash_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ hash_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+entropy_test@EXEEXT@: entropy_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+entropy2_test@EXEEXT@: entropy2_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ entropy2_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+sock_test@EXEEXT@: sock_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sock_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+sym_test@EXEEXT@: sym_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sym_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+task_test@EXEEXT@: task_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ task_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+shutdown_test@EXEEXT@: shutdown_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ shutdown_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+timer_test@EXEEXT@: timer_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ timer_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+ratelimiter_test@EXEEXT@: ratelimiter_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ ratelimiter_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+rbt_test@EXEEXT@: rbt_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rbt_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+rwlock_test@EXEEXT@: rwlock_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ rwlock_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+master_test@EXEEXT@: master_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ master_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+db_test@EXEEXT@: db_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ db_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+mempool_test@EXEEXT@: mempool_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ mempool_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+serial_test@EXEEXT@: serial_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ serial_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+zone_test@EXEEXT@: zone_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ zone_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+fsaccess_test@EXEEXT@: fsaccess_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ fsaccess_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+inter_test@EXEEXT@: inter_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ inter_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+keyboard_test@EXEEXT@: keyboard_test.@O@ ${ISCDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ keyboard_test.@O@ \
+               ${ISCLIBS} ${LIBS}
+
+lwresconf_test@EXEEXT@: lwresconf_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lwresconf_test.@O@ \
+               ${LWRESLIBS} ${ISCLIBS} ${LIBS}
+
+lwres_test@EXEEXT@: lwres_test.@O@ ${ISCDEPLIBS} ${LWRESDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ lwres_test.@O@ \
+               ${LWRESLIBS} ${ISCLIBS} ${LIBS}
+
+gxbn_test@EXEEXT@: gxbn_test.@O@ ${LWRESDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ gxbn_test.@O@ \
+               ${LWRESLIBS} ${ISCLIBS} ${LIBS}
+
+gxba_test@EXEEXT@: gxba_test.@O@ ${LWRESDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ gxba_test.@O@ \
+               ${LWRESLIBS} ${ISCLIBS} ${LIBS}
+
+sig0_test@EXEEXT@: sig0_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ sig0_test.@O@ \
+               ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+dst_test@EXEEXT@: dst_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
+               -o $@ dst_test.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+gsstest@EXEEXT@: gsstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} \
+               -o $@ gsstest.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+clean distclean::
+       rm -f ${TARGETS} ${XTARGETS}
+       rm -f backtrace_test_symtbl.c
+
+check: test
+
+test:
+       @for dir in $(TESTDIRS) ;\
+       do \
+               ( cd $$dir; $(MAKE) test ) ;\
+       done
similarity index 99%
rename from bin/tests/adb_test.c
rename to bin/tests/optional/adb_test.c
index 580ee2e3bcaf51a649a7f8e819553507faf6ce4c..52108da4ff61804c18e03b51ecb9928817b370de 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: adb_test.c,v 1.73 2011/08/30 23:46:51 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
similarity index 97%
rename from bin/tests/backtrace_test.c
rename to bin/tests/optional/backtrace_test.c
index 6817bee7e36e0b25b5cef6e64d343dea4320941d..67d399225e8a57969b7216a382844a97f2949674 100644 (file)
@@ -14,8 +14,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: backtrace_test.c,v 1.4 2009/09/02 23:48:01 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdio.h>
similarity index 99%
rename from bin/tests/byaddr_test.c
rename to bin/tests/optional/byaddr_test.c
index b0732347f7e81bcc99433130450b11fb4f88657b..d7e53b6d08b09b6140fb2509dd4c9679461716e1 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: byaddr_test.c,v 1.28 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file
  * \author
  * Principal Author: Bob Halley
similarity index 99%
rename from bin/tests/db_test.c
rename to bin/tests/optional/db_test.c
index 78d811fffc85fc42fbb4448e588e2b5fe0926224..e09ce0955bda7f1c170a0fa11a33be91b696d472 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db_test.c,v 1.70 2011/08/29 23:46:44 tbox Exp $ */
-
 /*! \file
  * \author
  * Principal Author: Bob Halley
similarity index 99%
rename from bin/tests/dst/dst_test.c
rename to bin/tests/optional/dst_test.c
index c5b310fadd574b9a02086d4c0740eecfdb868661..0f83a3fce191fd9cf0b4a0279190dab1a0baa51f 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dst_test.c,v 1.46 2009/09/01 00:22:25 jinmei Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
similarity index 98%
rename from bin/tests/entropy2_test.c
rename to bin/tests/optional/entropy2_test.c
index e540341de54a967e775776c17aef64f51a1509f1..a479ac87ee6c4fd0462974aba5699ef0b804987e 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy2_test.c,v 1.16 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
@@ -173,4 +171,3 @@ main(int argc, char **argv) {
 
        return (0);
 }
-
similarity index 98%
rename from bin/tests/entropy_test.c
rename to bin/tests/optional/entropy_test.c
index a2dbb7d36f1ab3dd7d796df02931890f6a099ce3..89bc7854691536b6d7892ead7c68e74c214d14da 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: entropy_test.c,v 1.23 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
@@ -138,4 +136,3 @@ main(int argc, char **argv) {
 
        return (0);
 }
-
similarity index 96%
rename from bin/tests/fsaccess_test.c
rename to bin/tests/optional/fsaccess_test.c
index a4e9bd6740436d9ff2a8f61fce60ab0d18bcd2b1..14959d2cd4a0d43a6d3bc61af6b9167c044d781e 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: fsaccess_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 
 #include <config.h>
similarity index 97%
rename from bin/tests/gxba_test.c
rename to bin/tests/optional/gxba_test.c
index ee662235fa1e24ad9c616581a92fdbe1608b3ec7..f9d968def22ec38339aef71e7c794237fee0967a 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gxba_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
similarity index 97%
rename from bin/tests/gxbn_test.c
rename to bin/tests/optional/gxbn_test.c
index 5b744f32fc919ca2aa08cb4056f0a2483e0ee2c0..ed8198357fbe368b2f9d63328a74aa52bb77f114 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: gxbn_test.c,v 1.16 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
similarity index 99%
rename from bin/tests/hash_test.c
rename to bin/tests/optional/hash_test.c
index 01a0965b6c99958633568dd5a9901fe35c2f91f9..6ae160b0b662c5ecd7fe87fc2cb7ff870914bb41 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: hash_test.c,v 1.19 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
similarity index 96%
rename from bin/tests/keyboard_test.c
rename to bin/tests/optional/keyboard_test.c
index 71ac65e59f7906f04559fb577ac268b234344f43..67c22c0c1d6ba95e1abc3b80d1c84535d2e94fef 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: keyboard_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
@@ -73,4 +71,3 @@ main(int argc, char **argv) {
 
        return (0);
 }
-
similarity index 98%
rename from bin/tests/lex_test.c
rename to bin/tests/optional/lex_test.c
index 909cfe33efedbdab68f15ad68ed07915a4ade4e8..2adf62ee7ef5a2aeb7f94f1a3c03df815cc7214f 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lex_test.c,v 1.23 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
similarity index 97%
rename from bin/tests/lfsr_test.c
rename to bin/tests/optional/lfsr_test.c
index 6ae630440bf62f03ea2516af11cbe7d8503caf18..931af0d6a4037b7673e90f52be3933869869d99d 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lfsr_test.c,v 1.16 2007/06/19 23:46:59 tbox Exp $ */
-
 /*! \file */
 #include <config.h>
 
similarity index 99%
rename from bin/tests/log_test.c
rename to bin/tests/optional/log_test.c
index 1c3f90b5bbca6230ce41d90b73ae9cded095994f..84f61af118c581dfbe85c278a0416ce6ae183222 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: log_test.c,v 1.29 2011/08/28 23:46:51 marka Exp $ */
-
 /* Principal Authors: DCL */
 
 #include <config.h>
similarity index 99%
rename from bin/tests/lwres_test.c
rename to bin/tests/optional/lwres_test.c
index 4d30df42bd262b60ad020951cbcc0c51e7ed58e6..fb60c46d90a02bed4bd55707f82007de9b3c8d8a 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwres_test.c,v 1.31 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <assert.h>
similarity index 97%
rename from bin/tests/lwresconf_test.c
rename to bin/tests/optional/lwresconf_test.c
index d07d775c400b4d325c816342b20d1ac066f0faef..ebb30f9c1455931cbf1fedc28a456a663ab373c5 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: lwresconf_test.c,v 1.13 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
similarity index 97%
rename from bin/tests/master_test.c
rename to bin/tests/optional/master_test.c
index b5d7befd63f406f76175d643c5fc504a3453c692..e70304dc94ab4fdc4eb35f994cc3b030a83d5375 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: master_test.c,v 1.32 2009/09/02 23:48:01 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
similarity index 97%
rename from bin/tests/mempool_test.c
rename to bin/tests/optional/mempool_test.c
index 9423b3ae1a30e13d759c5f01f849193183cb0e96..e77d75c57e4c45126656d24b0af43de81036918b 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: mempool_test.c,v 1.17 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <isc/mem.h>
similarity index 98%
rename from bin/tests/nsecify.c
rename to bin/tests/optional/nsecify.c
index c4b35efffedc394ae3d5046b0bb83637a5a08f45..7c8f295e467cb6cb792d1fcbc63c9bf161244958 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsecify.c,v 1.12 2011/08/29 23:46:44 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
similarity index 98%
rename from bin/tests/ratelimiter_test.c
rename to bin/tests/optional/ratelimiter_test.c
index ee54c62be28a0557fc495bcde51640d3299a39be..7e644a2309c54be1d1d66e2e80c755a7ea64f4cf 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: ratelimiter_test.c,v 1.18 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <isc/app.h>
similarity index 99%
rename from bin/tests/rbt_test.c
rename to bin/tests/optional/rbt_test.c
index 1f9b505f9ac89c18b4b67f329469ced611781e57..71f33d5f858ba9a8b76edbf247f24fee31eac069 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rbt_test.c,v 1.52 2011/08/28 23:46:41 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
similarity index 95%
rename from bin/tests/rbt_test.txt
rename to bin/tests/optional/rbt_test.txt
index 0db5ecd62d630ef2d93d4dbe8ffc2d63cad67473..c7230046fe27c36643faa9b2ca2df0ef9a0f02d7 100644 (file)
 # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 # PERFORMANCE OF THIS SOFTWARE.
 
-# $Id: rbt_test.txt,v 1.17 2007/06/19 23:46:59 tbox Exp $\r
-\r
-add a.vix.com\r
-add b.vix.com\r
-add c.vix.com\r
-print\r
-add a.b.c.d.e.f.vix.com\r
-add b.b.c.d.e.f.vix.com\r
-add c.b.c.d.e.f.vix.com\r
-print\r
-add a.d.e.f.vix.com\r
-add q.d.e.f.vix.com\r
-add d.e.f.vix.com\r
-print\r
-add g.h.vix.com\r
-print\r
-search q.d.e.f.vix.com\r
-search just-parent.a.vix.com\r
-search no-real-parent.vix.com\r
-search does.not.exist.at.all\r
-forward\r
-backward\r
-# existing name\r
-check vix.com.\r
-# greater than stop node, which has down pointer\r
-check zzz.com.\r
-# less than lowest in level (would be left link from stop node)\r
-check 0.vix.com\r
-# greater than stop node, no down pointer\r
-check d.vix.com\r
-# superdomain stored in existing node\r
-check f.vix.com\r
-# common ancestor stored in existing node; existing is successor\r
-check a.e.f.vix.com\r
-# common ancestor stored in existing node; existing is less but not predecessor\r
-check z.e.f.vix.com\r
-#\r
-check g.vix.com\r
-#\r
-check i.vix.com\r
-#\r
-check b.c.vix.com\r
-nuke d.e.f.vix.com\r
-print\r
-add x.a.vix.com\r
-add y.x.a.vix.com\r
-print\r
-delete a.vix.com\r
-delete x.a.vix.com\r
-print\r
-delete b.vix.com\r
-delete c.vix.com\r
-print\r
-delete y.x.a.vix.com\r
-print\r
-delete g.h.vix.com.\r
-add \[b100000].vix.com.\r
-add \[b010000].vix.com.\r
-add \[b001000].vix.com.\r
-add \[b000100].vix.com.\r
-add \[b000010].vix.com.\r
-add \[b000001].vix.com.\r
-p\r
-search \[b000100].vix.com.\r
-# zap the entire tree\r
-add vix.com.\r
-nuke vix.com.\r
-add a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.\r
-add b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.\r
-print\r
-add .\r
-# zap it again\r
-nuke .\r
-# test splitting of maximal bitstring\r
-add \[xFFFF/16].\[xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/256].com\r
-add \[xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/128].com\r
-print\r
-quit\r
+add a.vix.com
+add b.vix.com
+add c.vix.com
+print
+add a.b.c.d.e.f.vix.com
+add b.b.c.d.e.f.vix.com
+add c.b.c.d.e.f.vix.com
+print
+add a.d.e.f.vix.com
+add q.d.e.f.vix.com
+add d.e.f.vix.com
+print
+add g.h.vix.com
+print
+search q.d.e.f.vix.com
+search just-parent.a.vix.com
+search no-real-parent.vix.com
+search does.not.exist.at.all
+forward
+backward
+# existing name
+check vix.com.
+# greater than stop node, which has down pointer
+check zzz.com.
+# less than lowest in level (would be left link from stop node)
+check 0.vix.com
+# greater than stop node, no down pointer
+check d.vix.com
+# superdomain stored in existing node
+check f.vix.com
+# common ancestor stored in existing node; existing is successor
+check a.e.f.vix.com
+# common ancestor stored in existing node; existing is less but not predecessor
+check z.e.f.vix.com
+#
+check g.vix.com
+#
+check i.vix.com
+#
+check b.c.vix.com
+nuke d.e.f.vix.com
+print
+add x.a.vix.com
+add y.x.a.vix.com
+print
+delete a.vix.com
+delete x.a.vix.com
+print
+delete b.vix.com
+delete c.vix.com
+print
+delete y.x.a.vix.com
+print
+delete g.h.vix.com.
+add \[b100000].vix.com.
+add \[b010000].vix.com.
+add \[b001000].vix.com.
+add \[b000100].vix.com.
+add \[b000010].vix.com.
+add \[b000001].vix.com.
+p
+search \[b000100].vix.com.
+# zap the entire tree
+add vix.com.
+nuke vix.com.
+add a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.
+add b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.a.b.c.d.e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.
+print
+add .
+# zap it again
+nuke .
+# test splitting of maximal bitstring
+add \[xFFFF/16].\[xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/256].com
+add \[xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF/128].com
+print
+quit
similarity index 98%
rename from bin/tests/rwlock_test.c
rename to bin/tests/optional/rwlock_test.c
index cfdcde8e1ccfc6a24ea38dff384477822b56a4bc..e5175e2ecd3fa6bd9782fee1613e2d046f5fdc0c 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rwlock_test.c,v 1.26 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdio.h>
similarity index 95%
rename from bin/tests/serial_test.c
rename to bin/tests/optional/serial_test.c
index 9e82a0485144ff082462efcd89df20bcac26ae99..c75426828e2deeba78bf78b818c8615eaa12441e 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: serial_test.c,v 1.15 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdio.h>
similarity index 98%
rename from bin/tests/shutdown_test.c
rename to bin/tests/optional/shutdown_test.c
index aeea422f546f88202181b1dd5d2cf9847418f512..c373a53d8774e3d5901bfbeeee703c682365d552 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: shutdown_test.c,v 1.25 2011/08/28 23:46:41 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
similarity index 99%
rename from bin/tests/sig0_test.c
rename to bin/tests/optional/sig0_test.c
index edbc14f36975d79ec3ed46312e652863ddf1bc1e..4018d5506307f7fff05e8e457f6b36a60c02b9fd 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sig0_test.c,v 1.19 2009/09/02 23:48:01 tbox Exp $ */
-
 #include <config.h>
 
 #include <stddef.h>
similarity index 99%
rename from bin/tests/sock_test.c
rename to bin/tests/optional/sock_test.c
index 3add4fb80bd19266c4d521d223f1b9af153e78c4..2df44b5f37260b183382bba915aa8aa9ead31527 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sock_test.c,v 1.55 2008/07/23 23:27:54 marka Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
similarity index 98%
rename from bin/tests/sym_test.c
rename to bin/tests/optional/sym_test.c
index be227c0557fff51b4a7d1568035046b3ddddfc6f..b59c0ac58299e84741f14d09ed9d9c406c5021ac 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: sym_test.c,v 1.28 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <string.h>
similarity index 98%
rename from bin/tests/task_test.c
rename to bin/tests/optional/task_test.c
index 9f4c7abfe88b14fe87aee2f2adad5ab969bdd452..d056ed17c7f094e6febdbe09fa5acd5a732e7ac9 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: task_test.c,v 1.51 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
similarity index 98%
rename from bin/tests/timer_test.c
rename to bin/tests/optional/timer_test.c
index 5d5ae1c940f18ed467ee99e39f7440059067d66b..a1c6539dfa04f04056cf451e9df87b9d48cfc49e 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: timer_test.c,v 1.40 2007/06/19 23:46:59 tbox Exp $ */
-
 #include <config.h>
 
 #include <stdlib.h>
similarity index 99%
rename from bin/tests/zone_test.c
rename to bin/tests/optional/zone_test.c
index 1c4a115212d230da2e0c2aada98c3e731c849663..665a0f836400b7c65d77700fbe60d59195dc2b5e 100644 (file)
@@ -15,8 +15,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone_test.c,v 1.35 2009/09/02 23:48:01 tbox Exp $ */
-
 #include <config.h>
 
 #include <sys/param.h>
diff --git a/bin/tests/t_api.pl b/bin/tests/t_api.pl
deleted file mode 100644 (file)
index 9bc47ae..0000000
+++ /dev/null
@@ -1,223 +0,0 @@
-#!/usr/local/bin/perl
-#
-# Copyright (C) 2004, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1999-2001  Internet Software Consortium.
-#
-# 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: t_api.pl,v 1.10 2007/06/19 23:46:59 tbox Exp $
-
-require "getopts.pl";
-
-#
-# a minimalistic test api in perl compatable with the C api
-# used for the bind 9 regression tests
-#
-
-sub t_info {
-       package t_api;
-       local($format, @rest) = @_;
-       printf("I:${format}%s", @rest);
-}
-
-sub t_result {
-       package t_api;
-       local($result) = @_;
-       $T_inresult = 1;
-       printf("R:$result\n");
-}
-
-sub t_assert {
-       package t_api;
-       local($component, $anum, $class, $what, @rest) = @_;
-       printf("A:%s:%d:%s:$what\n", $component, $anum, $class, @rest);
-}
-
-sub t_getenv {
-       package t_api;
-       local($name) = @_;
-       return($T_env{$name}) if (defined($T_env{$name}));
-}
-
-package t_api;
-
-$| = 1;
-
-sub t_on_abort {
-       $T_aborted = 1;
-       &t_info("got abort\n");
-       die;
-}
-
-sub t_on_alarm {
-       $T_timedout = 1;
-       &t_info("got alarm\n");
-       die;
-}
-
-sub t_on_int {
-       $T_terminated = 1;
-       &t_info("got int\n");
-       die;
-}
-
-# initialize the test environment
-sub t_initconf {
-       local($cfile) = @_;
-       local($name, $value);
-
-       if ((-f $cfile) && (-s _)) {
-               open(XXX, "< $cfile");
-               while (<XXX>) {
-                       next if (/^\#/);
-                       next unless (/=/);
-                       chop;
-                       ($name, $value) = split(/=/, $_, 2);
-                       $T_env{$name} = $value;
-               }
-               close(XXX);
-       }
-}
-
-# dump the configuration to the journal
-sub t_dumpconf {
-       local($name, $value);
-
-       foreach $name (sort keys %T_env) {
-               &main't_info("%s\t%s\n", $name, $T_env{$name});
-       }
-}
-
-# run a test
-sub doTestN {
-       package main;
-       local($testnumber) = @_;
-       local($status);
-
-       if (defined($T_testlist[$testnumber])) {
-
-               $t_api'T_inresult       = 0;
-               $t_api'T_aborted        = 0;
-               $t_api'T_timedout       = 0;
-               $t_api'T_terminated     = 0;
-               $t_api'T_unresolved     = 0;
-
-               alarm($t_api'T_timeout);
-               $status = eval($T_testlist[$testnumber]);
-               alarm(0);
-
-               if (! defined($status)) {
-                       &t_info("The test case timed out\n") if ($t_api'T_timedout);
-                       &t_info("The test case was terminated\n") if ($t_api'T_terminated);
-                       &t_info("The test case was aborted\n") if ($t_api'T_aborted);
-                       &t_result("UNRESOLVED");
-               }
-               elsif (! $t_api'T_inresult) {
-                       &t_result("NORESULT");
-               }
-       }
-       else {
-               &t_info("Test %d is not defined\n", $testnumber);
-               &t_result("UNTESTED");
-       }
-}
-
-$T_usage = "Usage:
-       a               : run all tests
-        b <dir>         : cd to dir before running tests
-        c <configfile>  : use configfile instead of t_config
-        d <level>       : set debug level to level
-        h               : print test info                       (not implemented)
-        u               : print usage info
-        n <testnumber>  : run test number testnumber
-        t <name>        : run test named testname              (not implemented)
-        q <seconds>     : use seconds as the timeout value
-        x               : don't execute tests in a subproc      (n/a)
-";
-
-# get command line args
-&main'Getopts('ab:c:d:hun:t:q:x');
-
-# if -u, print usage and exit
-if (defined($main'opt_u)) {
-       print $T_usage;
-       exit(0);
-}
-
-# implement -h and -t after we add test descriptions to T_testlist ZZZ
-if (defined($main'opt_h)) {
-       print "the -h option is not implemented\n";
-       exit(0);
-}
-
-if (defined($main'opt_t)) {
-       print "the -t option is not implemented\n";
-       exit(0);
-}
-
-#
-# silently ignore the -x option
-# this exists in the C version of the api
-# to facilitate exception debugging with gdb
-# and is not meaningful here
-#
-
-$T_configfile  = "t_config";
-$T_debug       = 0;
-$T_timeout     = 10;
-$T_testnum     = -1;
-
-$T_dir         = $main'opt_b if (defined($main'opt_b));
-$T_debug       = $main'opt_d if (defined($main'opt_d));
-$T_configfile  = $main'opt_c if (defined($main'opt_c));
-$T_testnum     = $main'opt_n if (defined($main'opt_n));
-$T_timeout     = $main'opt_q if (defined($main'opt_q));
-
-$SIG{'ABRT'} = 't_api\'t_on_abort';
-$SIG{'ALRM'} = 't_api\'t_on_alarm';
-$SIG{'INT'}  = 't_api\'t_on_int';
-$SIG{'QUIT'} = 't_api\'t_on_int';
-
-# print the start line
-$date = `date`;
-chop $date;
-($cmd = $0) =~ s/\.\///g;
-printf("S:$cmd:$date\n");
-
-# initialize the test environment
-&t_initconf($T_configfile);
-&t_dumpconf() if ($T_debug);
-
-# establish working directory if requested
-chdir("$T_dir") if (defined($T_dir) && (-d "$T_dir"));
-
-# run the tests
-if ($T_testnum == -1) {
-       # run all tests
-       $T_ntests = $#main'T_testlist + 1;
-       for ($T_cnt = 0; $T_cnt < $T_ntests; ++$T_cnt) {
-               &doTestN($T_cnt);
-       }
-}
-else {
-       # otherwise run the specified test
-       &doTest($T_testnum);
-}
-
-# print the end line
-$date = `date`;
-chop $date;
-printf("E:$cmd:$date\n");
-
-1;
-
index 0ad6339905ce93d63610337eed608721d4137b9c..cdbbf24667b494dab98de1bb74ad7599bfde3b9e 100755 (executable)
--- a/configure
+++ b/configure
@@ -23000,7 +23000,7 @@ ac_config_commands="$ac_config_commands chmod"
 # elsewhere if there's a good reason for doing so.
 #
 
-ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keyzone.py bin/python/isc/tests/dnskey_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzredir/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/cookie/prereq.sh bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
+ac_config_files="$ac_config_files make/Makefile make/mkdep Makefile bin/Makefile bin/check/Makefile bin/confgen/Makefile bin/confgen/unix/Makefile bin/delv/Makefile bin/dig/Makefile bin/dnssec/Makefile bin/named/Makefile bin/named/unix/Makefile bin/nsupdate/Makefile bin/pkcs11/Makefile bin/python/Makefile bin/python/isc/Makefile bin/python/isc/utils.py bin/python/isc/tests/Makefile bin/python/dnssec-checkds.py bin/python/dnssec-coverage.py bin/python/isc/__init__.py bin/python/isc/checkds.py bin/python/isc/coverage.py bin/python/isc/dnskey.py bin/python/isc/eventlist.py bin/python/isc/keydict.py bin/python/isc/keyevent.py bin/python/isc/keyzone.py bin/python/isc/tests/dnskey_test.py bin/rndc/Makefile bin/tests/Makefile bin/tests/atomic/Makefile bin/tests/db/Makefile bin/tests/dst/Makefile bin/tests/dst/Kdh.+002+18602.key bin/tests/dst/Kdh.+002+18602.private bin/tests/dst/Kdh.+002+48957.key bin/tests/dst/Kdh.+002+48957.private bin/tests/dst/Ktest.+001+00002.key bin/tests/dst/Ktest.+001+54622.key bin/tests/dst/Ktest.+001+54622.private bin/tests/dst/Ktest.+003+23616.key bin/tests/dst/Ktest.+003+23616.private bin/tests/dst/Ktest.+003+49667.key bin/tests/dst/dst_2_data bin/tests/dst/t2_data_1 bin/tests/dst/t2_data_2 bin/tests/dst/t2_dsasig bin/tests/dst/t2_rsasig bin/tests/hashes/Makefile bin/tests/headerdep_test.sh bin/tests/master/Makefile bin/tests/mem/Makefile bin/tests/names/Makefile bin/tests/net/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/Makefile bin/tests/sockaddr/Makefile bin/tests/system/Makefile bin/tests/system/conf.sh bin/tests/system/dlz/prereq.sh bin/tests/system/dlzredir/prereq.sh bin/tests/system/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/cookie/prereq.sh bin/tests/system/tkey/Makefile bin/tests/tasks/Makefile bin/tests/timers/Makefile bin/tests/virtual-time/Makefile bin/tests/virtual-time/conf.sh bin/tools/Makefile contrib/scripts/check-secure-delegation.pl contrib/scripts/zone-edit.sh doc/Makefile doc/arm/Makefile doc/arm/noteversion.xml doc/arm/pkgversion.xml doc/arm/releaseinfo.xml doc/doxygen/Doxyfile doc/doxygen/Makefile doc/doxygen/doxygen-input-filter doc/misc/Makefile doc/tex/Makefile doc/tex/armstyle.sty doc/xsl/Makefile doc/xsl/isc-docbook-chunk.xsl doc/xsl/isc-docbook-html.xsl doc/xsl/isc-manpage.xsl doc/xsl/isc-notes-html.xsl isc-config.sh lib/Makefile lib/bind9/Makefile lib/bind9/include/Makefile lib/bind9/include/bind9/Makefile lib/dns/Makefile lib/dns/include/Makefile lib/dns/include/dns/Makefile lib/dns/include/dst/Makefile lib/dns/tests/Makefile lib/irs/Makefile lib/irs/include/Makefile lib/irs/include/irs/Makefile lib/irs/include/irs/netdb.h lib/irs/include/irs/platform.h lib/irs/tests/Makefile lib/isc/$arch/Makefile lib/isc/$arch/include/Makefile lib/isc/$arch/include/isc/Makefile lib/isc/$thread_dir/Makefile lib/isc/$thread_dir/include/Makefile lib/isc/$thread_dir/include/isc/Makefile lib/isc/Makefile lib/isc/include/Makefile lib/isc/include/isc/Makefile lib/isc/include/isc/platform.h lib/isc/include/pk11/Makefile lib/isc/include/pkcs11/Makefile lib/isc/tests/Makefile lib/isc/nls/Makefile lib/isc/unix/Makefile lib/isc/unix/include/Makefile lib/isc/unix/include/isc/Makefile lib/isc/unix/include/pkcs11/Makefile lib/isccc/Makefile lib/isccc/include/Makefile lib/isccc/include/isccc/Makefile lib/isccfg/Makefile lib/isccfg/include/Makefile lib/isccfg/include/isccfg/Makefile lib/lwres/Makefile lib/lwres/include/Makefile lib/lwres/include/lwres/Makefile lib/lwres/include/lwres/netdb.h lib/lwres/include/lwres/platform.h lib/lwres/man/Makefile lib/lwres/tests/Makefile lib/lwres/unix/Makefile lib/lwres/unix/include/Makefile lib/lwres/unix/include/lwres/Makefile lib/tests/Makefile lib/tests/include/Makefile lib/tests/include/tests/Makefile lib/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
 
 
 #
@@ -24049,6 +24049,7 @@ do
     "bin/tests/mem/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/mem/Makefile" ;;
     "bin/tests/names/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/names/Makefile" ;;
     "bin/tests/net/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/net/Makefile" ;;
+    "bin/tests/optional/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/optional/Makefile" ;;
     "bin/tests/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/pkcs11/Makefile" ;;
     "bin/tests/pkcs11/benchmarks/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/pkcs11/benchmarks/Makefile" ;;
     "bin/tests/rbt/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/rbt/Makefile" ;;
index 47c7c2e938bf8954fff9a03d8f16a7d6bc0b9a3a..90ada32fb79eb35731fc81f212b1a6965441c61b 100644 (file)
@@ -5175,6 +5175,7 @@ AC_CONFIG_FILES([
        bin/tests/mem/Makefile
        bin/tests/names/Makefile
        bin/tests/net/Makefile
+       bin/tests/optional/Makefile
        bin/tests/pkcs11/Makefile
        bin/tests/pkcs11/benchmarks/Makefile
        bin/tests/rbt/Makefile