]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
remove lib/tests as nothing uses it anymore
authorEvan Hunt <each@isc.org>
Thu, 1 Mar 2018 20:59:06 +0000 (12:59 -0800)
committerEvan Hunt <each@isc.org>
Sat, 10 Mar 2018 02:48:59 +0000 (18:48 -0800)
(cherry picked from commit d132f73497db82674efc3b8f6ab36308f4476349)
(cherry picked from commit d35f62434ac8f6395bdbe5647be0532087d1e14a)
(cherry picked from commit 941946cf145bea05e406db7fb7dc0e6f2cc49b71)

18 files changed:
configure
configure.in
lib/Makefile.in
lib/tests/Makefile.in [deleted file]
lib/tests/T_testlist.imp [deleted file]
lib/tests/include/Makefile.in [deleted file]
lib/tests/include/tests/Makefile.in [deleted file]
lib/tests/include/tests/t_api.h [deleted file]
lib/tests/t_api.c [deleted file]
lib/tests/win32/DLLMain.c [deleted file]
lib/tests/win32/libtests.def [deleted file]
lib/tests/win32/libtests.dsp.in [deleted file]
lib/tests/win32/libtests.dsw [deleted file]
lib/tests/win32/libtests.mak.in [deleted file]
lib/tests/win32/libtests.vcxproj.filters.in [deleted file]
lib/tests/win32/libtests.vcxproj.in [deleted file]
lib/tests/win32/libtests.vcxproj.user [deleted file]
util/copyrights

index c5d52df4bc151608a4ae1f61c52e20ce3087eb9a..03d086bb932014aab13896b777bf8f4547c1c43e 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/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/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/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/headerdep_test.sh bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/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/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/samples/Makefile lib/samples/Makefile-postinstall unit/Makefile unit/unittest.sh"
 
 
 #
@@ -24111,9 +24111,6 @@ do
     "lib/lwres/unix/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/Makefile" ;;
     "lib/lwres/unix/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/include/Makefile" ;;
     "lib/lwres/unix/include/lwres/Makefile") CONFIG_FILES="$CONFIG_FILES lib/lwres/unix/include/lwres/Makefile" ;;
-    "lib/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/tests/Makefile" ;;
-    "lib/tests/include/Makefile") CONFIG_FILES="$CONFIG_FILES lib/tests/include/Makefile" ;;
-    "lib/tests/include/tests/Makefile") CONFIG_FILES="$CONFIG_FILES lib/tests/include/tests/Makefile" ;;
     "lib/samples/Makefile") CONFIG_FILES="$CONFIG_FILES lib/samples/Makefile" ;;
     "lib/samples/Makefile-postinstall") CONFIG_FILES="$CONFIG_FILES lib/samples/Makefile-postinstall" ;;
     "unit/Makefile") CONFIG_FILES="$CONFIG_FILES unit/Makefile" ;;
index 86eb021e6cd01efc47648bf103e5dcb2373e4957..72d59b39ecb0a703f711de77a7e34dca7488963e 100644 (file)
@@ -5237,9 +5237,6 @@ AC_CONFIG_FILES([
        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
index 86302bd34e5b33b3b7f87c35f031665ad3dbbb5c..99b21b6bae6302ddea38a76728985bd0f66ac7d2 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.21 2007/06/19 23:47:13 tbox Exp $
-
 srcdir =       @srcdir@
 VPATH =                @srcdir@
 top_srcdir =   @top_srcdir@
@@ -23,7 +21,7 @@ top_srcdir =  @top_srcdir@
 # Attempt to disable parallel processing.
 .NOTPARALLEL:
 .NO_PARALLEL:
-SUBDIRS =      isc isccc dns isccfg bind9 lwres irs tests samples
+SUBDIRS =      isc isccc dns isccfg bind9 lwres irs samples
 TARGETS =
 
 @BIND9_MAKE_RULES@
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in
deleted file mode 100644 (file)
index 0280265..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2004, 2007, 2009, 2012  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1998-2001, 2003  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: Makefile.in,v 1.28 2009/12/05 23:31:41 each Exp $
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =    ${DNS_INCLUDES} ${ISC_INCLUDES} ${TEST_INCLUDES}
-CDEFINES =
-CWARNINGS =
-
-ISCLIBS =      ../../lib/isc/libisc.@A@
-ISCCCLIBS =    ../../lib/isccc/libisccc.@A@
-
-ISCDEPLIBS =   ../../lib/isc/libisc.@A@
-ISCCCDEPLIBS = libisccc.@A@
-
-OBJS =         t_api.@O@
-
-SRCS =         t_api.c
-
-SUBDIRS =      include
-TARGETS =      timestamp
-
-@BIND9_MAKE_RULES@
-
-libt_api.@SA@: ${OBJS}
-       ${AR} ${ARFLAGS} $@ ${OBJS}
-       ${RANLIB} $@
-
-libt_api.la: ${OBJS}
-       ${LIBTOOL_MODE_LINK} \
-               ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libt_api.la -rpath ${libdir} \
-               ${OBJS} ${ISCLIBS} ${LIBS} @LIBTOOL_ALLOW_UNDEFINED@ @LIBTOOL_IN_MAIN@
-
-timestamp: libt_api.@A@
-       touch timestamp
-
-clean distclean::
-       rm -f t_api.@O@ libt_api.@A@ timestamp
diff --git a/lib/tests/T_testlist.imp b/lib/tests/T_testlist.imp
deleted file mode 100644 (file)
index 722caff..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-#! .
-
-T_testlist
diff --git a/lib/tests/include/Makefile.in b/lib/tests/include/Makefile.in
deleted file mode 100644 (file)
index b529c75..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 2004, 2007, 2012  Internet Systems Consortium, Inc. ("ISC")
-# Copyright (C) 1998-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: Makefile.in,v 1.11 2007/06/19 23:47:24 tbox Exp $
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-SUBDIRS =      tests
-TARGETS =
-
-@BIND9_MAKE_RULES@
diff --git a/lib/tests/include/tests/Makefile.in b/lib/tests/include/tests/Makefile.in
deleted file mode 100644 (file)
index ebb0b58..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 2004, 2007, 2012, 2015  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: Makefile.in,v 1.9 2007/06/19 23:47:24 tbox Exp $
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-VERSION=@BIND9_VERSION@
-
-SUBDIRS =
-TARGETS =
-
-@BIND9_MAKE_RULES@
diff --git a/lib/tests/include/tests/t_api.h b/lib/tests/include/tests/t_api.h
deleted file mode 100644 (file)
index ffd15c7..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2004-2007, 2010, 2013, 2014, 2017  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.h,v 1.24 2010/06/08 23:50:24 tbox Exp $ */
-
-#ifndef TESTS_T_API_H
-#define TESTS_T_API_H 1
-
-/*! \file tests/t_api.h */
-
-#include <stdio.h>
-
-#include <isc/lang.h>
-#include <isc/platform.h>
-#include <isc/result.h>
-#include <isc/formatcheck.h>
-
-/*
- *
- * Result codes.
- *
- */
-
-#define        T_PASS          0x1
-#define        T_FAIL          0x2
-#define        T_UNRESOLVED    0x3
-#define        T_SKIPPED       0x4
-#define        T_UNTESTED      0x5
-#define        T_THREADONLY    0x6
-#define        T_PKCS11ONLY    0x7
-
-/*
- *
- * Assertion class codes.
- *
- */
-
-#define        T_OPTIONAL      0x0
-#define        T_REQUIRED      0x1
-
-/*
- * Misc
- */
-
-#define        T_MAXTOKS       16
-#define        T_ARG(n)        (*(av + (n)))
-
-typedef        void (*PFV)(void);
-
-typedef struct {
-       PFV             pfv;
-       const char      *func_name;
-} testspec_t;
-
-LIBTESTS_EXTERNAL_DATA extern  int     T_debug;
-#ifndef WIN32
-extern testspec_t T_testlist[];
-#endif
-
-ISC_LANG_BEGINDECLS
-
-#ifdef WIN32
-void
-t_settests(const testspec_t list[]);
-
-int
-t_main(int argc, char **argv);
-#endif
-
-void
-t_assert(const char *component, int anum, int tclass, const char *what, ...)
-     ISC_FORMAT_PRINTF(4, 5);
-
-void
-t_info(const char *format, ...) ISC_FORMAT_PRINTF(1, 2);
-
-void
-t_result(int result);
-
-char *
-t_getenv(const char *name);
-
-char *
-t_fgetbs(FILE *fp);
-
-isc_result_t
-t_dns_result_fromtext(char *result);
-
-unsigned int
-t_dc_method_fromtext(char *dc_method);
-
-int
-t_bustline(char *line, char **toks);
-
-int
-t_eval(const char *filename, int (*func)(char **), int nargs);
-
-ISC_LANG_ENDDECLS
-
-#endif /* TESTS_T_API_H */
-
diff --git a/lib/tests/t_api.c b/lib/tests/t_api.c
deleted file mode 100644 (file)
index 9dd32e9..0000000
+++ /dev/null
@@ -1,857 +0,0 @@
-/*
- * Copyright (C) 2004, 2005, 2007-2010, 2013, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
- * Copyright (C) 1999-2003  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.c,v 1.68 2010/12/21 04:20:23 marka Exp $ */
-
-/*! \file */
-
-#include <config.h>
-
-#include <ctype.h>
-#include <errno.h>
-#include <limits.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
-
-#ifndef WIN32
-#include <sys/wait.h>
-#else
-#include <direct.h>
-#endif
-
-#include <isc/boolean.h>
-#include <isc/commandline.h>
-#include <isc/platform.h>
-#include <isc/print.h>
-#include <isc/string.h>
-#include <isc/mem.h>
-
-#include <dns/compress.h>
-#include <dns/result.h>
-
-#include "include/tests/t_api.h"
-
-static const char *Usage =
-               "\t-a               : run all tests\n"
-               "\t-b <dir>         : chdir to dir before running tests"
-               "\t-c <config_file> : use specified config file\n"
-               "\t-d <debug_level> : set debug level to debug_level\n"
-               "\t-h               : print test info\n"
-               "\t-u               : print usage info\n"
-               "\t-n <test_name>   : run specified test name\n"
-               "\t-t <test_number> : run specified test number\n"
-               "\t-x               : don't execute tests in a subproc\n"
-               "\t-q <timeout>     : use 'timeout' as the timeout value\n";
-/*!<
- *             -a              -->     run all tests
- *             -b dir          -->     chdir to dir before running tests
- *             -c config       -->     use config file 'config'
- *             -d              -->     turn on api debugging
- *             -h              -->     print out available test names
- *             -u              -->     print usage info
- *             -n name         -->     run test named name
- *             -tn             -->     run test n
- *             -x              -->     don't execute testcases in a subproc
- *             -q timeout      -->     use 'timeout' as the timeout value
- */
-
-#define        T_MAXTESTS              256     /*% must be 0 mod 8 */
-#define        T_MAXENV                256
-#define        T_DEFAULT_CONFIG        "t_config"
-#define        T_BUFSIZ                256
-#define        T_BIGBUF                4096
-
-#define        T_TCTOUT                60
-
-int                    T_debug;
-int                    T_timeout;
-pid_t                  T_pid;
-static const char *    T_config;
-static char            T_tvec[T_MAXTESTS / 8];
-static char *          T_env[T_MAXENV + 1];
-static char            T_buf[T_BIGBUF];
-static char *          T_dir;
-#ifdef WIN32
-static testspec_t      T_testlist[T_MAXTESTS];
-#endif
-
-static int
-t_initconf(const char *path);
-
-static int
-t_dumpconf(const char *path);
-
-static int
-t_putinfo(const char *key, const char *info);
-
-static char *
-t_getdate(char *buf, size_t buflen);
-
-static void
-printhelp(void);
-
-static void
-printusage(void);
-
-static int     T_int;
-
-static void
-t_sighandler(int sig) {
-       T_int = sig;
-}
-
-int
-#ifndef WIN32
-main(int argc, char **argv)
-#else
-t_main(int argc, char **argv)
-#endif
-{
-       int                     c;
-       int                     tnum;
-#ifndef WIN32
-       int                     subprocs;
-       pid_t                   deadpid;
-       int                     status;
-#endif
-       int                     len;
-       isc_boolean_t           first;
-       testspec_t              *pts;
-#ifndef WIN32
-       struct sigaction        sa;
-#endif
-
-       isc_mem_debugging = ISC_MEM_DEBUGRECORD;
-       first = ISC_TRUE;
-#ifndef WIN32
-       subprocs = 1;
-#endif
-       T_timeout = T_TCTOUT;
-
-       /*
-        * -a option is now default.
-        */
-       memset(T_tvec, 0xff, sizeof(T_tvec));
-
-       /*
-        * Parse args.
-        */
-       while ((c = isc_commandline_parse(argc, argv, ":at:c:d:n:huxq:b:"))
-              != -1) {
-               if (c == 'a') {
-                       /*
-                        * Flag all tests to be run.
-                        */
-                       memset(T_tvec, 0xff, sizeof(T_tvec));
-               }
-               else if (c == 'b') {
-                       T_dir = isc_commandline_argument;
-               }
-               else if (c == 't') {
-                       tnum = atoi(isc_commandline_argument);
-                       if ((tnum > 0) && (tnum < T_MAXTESTS)) {
-                               if (first) {
-                                       /*
-                                        * Turn off effect of -a default
-                                        * and allow multiple -t and -n
-                                        * options.
-                                        */
-                                       memset(T_tvec, 0, sizeof(T_tvec));
-                                       first = ISC_FALSE;
-                               }
-                               /*
-                                * Flag test tnum to be run.
-                                */
-                               tnum -= 1;
-                               T_tvec[tnum / 8] |= (0x01 << (tnum % 8));
-                       }
-               }
-               else if (c == 'c') {
-                       T_config = isc_commandline_argument;
-               }
-               else if (c == 'd') {
-                       T_debug = atoi(isc_commandline_argument);
-               }
-               else if (c == 'n') {
-                       pts = &T_testlist[0];
-                       tnum = 0;
-                       while (pts->pfv != NULL) {
-                               if (! strcmp(pts->func_name,
-                                            isc_commandline_argument)) {
-                                       if (first) {
-                                               memset(T_tvec, 0,
-                                                      sizeof(T_tvec));
-                                               first = ISC_FALSE;
-                                       }
-                                       T_tvec[tnum/8] |= (0x01 << (tnum%8));
-                                       break;
-                               }
-                               ++pts;
-                               ++tnum;
-                       }
-                       if (pts->pfv == NULL) {
-                               fprintf(stderr, "no such test %s\n",
-                                       isc_commandline_argument);
-                               exit(1);
-                       }
-               }
-               else if (c == 'h') {
-                       printhelp();
-                       exit(0);
-               }
-               else if (c == 'u') {
-                       printusage();
-                       exit(0);
-               }
-               else if (c == 'x') {
-#ifndef WIN32
-                       subprocs = 0;
-#endif
-               }
-               else if (c == 'q') {
-                       T_timeout = atoi(isc_commandline_argument);
-               }
-               else if (c == ':') {
-                       fprintf(stderr, "Option -%c requires an argument\n",
-                                               isc_commandline_option);
-                       exit(1);
-               }
-               else if (c == '?') {
-                       fprintf(stderr, "Unrecognized option -%c\n",
-                               isc_commandline_option);
-                       exit(1);
-               }
-       }
-
-       /*
-        * Set cwd.
-        */
-
-       if (T_dir != NULL && chdir(T_dir) != 0) {
-               fprintf(stderr, "chdir %s failed\n", T_dir);
-               exit(1);
-       }
-
-       /*
-        * We don't want buffered output.
-        */
-
-       (void)setbuf(stdout, NULL);
-       (void)setbuf(stderr, NULL);
-
-       /*
-        * Setup signals.
-        */
-
-#ifndef WIN32
-       sa.sa_flags = 0;
-       sigfillset(&sa.sa_mask);
-
-       sa.sa_handler = t_sighandler;
-       (void)sigaction(SIGINT,  &sa, NULL);
-       (void)sigaction(SIGALRM, &sa, NULL);
-#endif
-
-       /*
-        * Output start stanza to journal.
-        */
-
-       snprintf(T_buf, sizeof(T_buf), "%s:", argv[0]);
-       len = strlen(T_buf);
-       (void) t_getdate(T_buf + len, T_BIGBUF - len);
-       t_putinfo("S", T_buf);
-
-       /*
-        * Setup the test environment using the config file.
-        */
-
-       if (T_config == NULL)
-               T_config = T_DEFAULT_CONFIG;
-
-       t_initconf(T_config);
-       if (T_debug)
-               t_dumpconf(T_config);
-
-       /*
-        * Now invoke all the test cases.
-        */
-
-       tnum = 0;
-       pts = &T_testlist[0];
-       while (pts->pfv != NULL) {
-               if (T_tvec[tnum / 8] & (0x01 << (tnum % 8))) {
-#ifndef WIN32
-                       if (subprocs) {
-                               T_pid = fork();
-                               if (T_pid == 0) {
-                                       (*pts->pfv)();
-                                       exit(0);
-                               } else if (T_pid > 0) {
-
-                                       T_int = 0;
-                                       sa.sa_handler = t_sighandler;
-                                       (void)sigaction(SIGALRM, &sa, NULL);
-                                       alarm(T_timeout);
-
-                                       deadpid = (pid_t) -1;
-                                       while (deadpid != T_pid) {
-                                           deadpid =
-                                                   waitpid(T_pid, &status, 0);
-                                           if (deadpid == T_pid) {
-                                                   if (WIFSIGNALED(status)) {
-                                                       if (WTERMSIG(status) ==
-                                                           SIGTERM)
-                                                               t_info(
-                                                 "the test case timed out\n");
-                                                       else
-                                                               t_info(
-                                        "the test case caused exception %d\n",
-                                                            WTERMSIG(status));
-                                                       t_result(T_UNRESOLVED);
-                                                   }
-                                           } else if ((deadpid == -1) &&
-                                                      (errno == EINTR) &&
-                                                      T_int) {
-                                                   kill(T_pid, SIGTERM);
-                                                   T_int = 0;
-                                           }
-                                           else if ((deadpid == -1) &&
-                                                    ((errno == ECHILD) ||
-                                                     (errno == ESRCH)))
-                                                   break;
-                                       }
-
-                                       alarm(0);
-                                       sa.sa_handler = SIG_IGN;
-                                       (void)sigaction(SIGALRM, &sa, NULL);
-                               } else {
-                                       t_info("fork failed, errno == %d\n",
-                                              errno);
-                                       t_result(T_UNRESOLVED);
-                               }
-                       }
-                       else {
-                               (*pts->pfv)();
-                       }
-#else
-                       (*pts->pfv)();
-#endif
-               }
-               ++pts;
-               ++tnum;
-       }
-
-       snprintf(T_buf, sizeof(T_buf), "%s:", argv[0]);
-       len = strlen(T_buf);
-       (void) t_getdate(T_buf + len, T_BIGBUF - len);
-       t_putinfo("E", T_buf);
-
-       return(0);
-}
-
-void
-t_assert(const char *component, int anum, int tclass, const char *what, ...) {
-       va_list args;
-       char buf[T_BIGBUF];
-
-       (void)printf("T:%s:%d:%s\n", component, anum, tclass == T_REQUIRED ?
-                    "A" : "C");
-
-       /*
-        * Format text to a buffer.
-        */
-       va_start(args, what);
-       (void)vsnprintf(buf, sizeof(buf), what, args);
-       va_end(args);
-
-       (void)t_putinfo("A", buf);
-       (void)printf("\n");
-}
-
-void
-t_info(const char *format, ...) {
-       va_list args;
-       char buf[T_BIGBUF];
-
-       va_start(args, format);
-       (void) vsnprintf(buf, sizeof(buf), format, args);
-       va_end(args);
-       (void) t_putinfo("I", buf);
-}
-
-void
-t_result(int result) {
-       const char *p;
-
-       switch (result) {
-               case T_PASS:
-                       p = "PASS";
-                       break;
-               case T_FAIL:
-                       p = "FAIL";
-                       break;
-               case T_UNRESOLVED:
-                       p = "UNRESOLVED";
-                       break;
-               case T_SKIPPED:
-                       p = "SKIPPED";
-                       break;
-               case T_UNTESTED:
-                       p = "UNTESTED";
-                       break;
-               case T_THREADONLY:
-                       p = "THREADONLY";
-                       break;
-               case T_PKCS11ONLY:
-                       p = "PKCS11ONLY";
-                       break;
-               default:
-                       p = "UNKNOWN";
-                       break;
-       }
-       printf("R:%s\n", p);
-}
-
-char *
-t_getenv(const char *name) {
-       char    *n;
-       char    **p;
-       size_t  len;
-
-       n = NULL;
-       if (name && *name) {
-
-               p = &T_env[0];
-               len = strlen(name);
-
-               while (*p != NULL) {
-                       if (strncmp(*p, name, len) == 0) {
-                               if ( *(*p + len) == '=') {
-                                       n = *p + len + 1;
-                                       break;
-                               }
-                       }
-                       ++p;
-               }
-       }
-       return(n);
-}
-
-/*
- *
- * Read in the config file at path, initializing T_env.
- *
- * note: no format checking for now ...
- *
- */
-
-static int
-t_initconf(const char *path) {
-
-       int     n;
-       int     rval;
-       char    **p;
-       FILE    *fp;
-
-       rval = -1;
-
-       fp = fopen(path, "r");
-       if (fp != NULL) {
-               n = 0;
-               p = &T_env[0];
-               while (n < T_MAXENV) {
-                       *p = t_fgetbs(fp);
-                       if (*p == NULL)
-                               break;
-                       if ((**p == '#') || (strchr(*p, '=') == NULL)) {
-                               /*
-                                * Skip comments and other junk.
-                                */
-                               (void)free(*p);
-                               continue;
-                       }
-                       ++p; ++n;
-               }
-               (void)fclose(fp);
-               rval = 0;
-       }
-
-       return (rval);
-}
-
-/*
- *
- * Dump T_env to stdout.
- *
- */
-
-static int
-t_dumpconf(const char *path) {
-       int     rval;
-       char    **p;
-       FILE    *fp;
-
-       rval = -1;
-       fp = fopen(path, "r");
-       if (fp != NULL) {
-               p = &T_env[0];
-               while (*p != NULL) {
-                       printf("C:%s\n", *p);
-                       ++p;
-               }
-               (void) fclose(fp);
-               rval = 0;
-       }
-       return(rval);
-}
-
-/*
- *
- * Read a newline or EOF terminated string from fp.
- * On success:
- *     return a malloc'd buf containing the string with
- *     the newline converted to a '\0'.
- * On error:
- *     return NULL.
- *
- * Caller is responsible for freeing buf.
- *
- */
-
-char *
-t_fgetbs(FILE *fp) {
-       int     c;
-       size_t  n;
-       size_t  size;
-       char    *buf, *old;
-       char    *p;
-
-       n = 0;
-       size = T_BUFSIZ;
-       old = buf = (char *) malloc(T_BUFSIZ * sizeof(char));
-
-       if (buf != NULL) {
-               p = buf;
-               while ((c = fgetc(fp)) != EOF) {
-
-                       if ((c == '\r') || (c == '\n'))
-                               break;
-
-                       *p++ = c;
-                       ++n;
-                       if ( n >= size ) {
-                               size += T_BUFSIZ;
-                               buf = (char *)realloc(buf,
-                                                     size * sizeof(char));
-                               if (buf == NULL)
-                                       goto err;
-                               old = buf;
-                               p = buf + n;
-                       }
-               }
-               *p = '\0';
-               if (c == EOF && n == 0U) {
-                       free(buf);
-                       return (NULL);
-               }
-               return (buf);
-       } else {
- err:
-               if (old != NULL)
-                       free(old);
-               fprintf(stderr, "malloc/realloc failed %d", errno);
-               return(NULL);
-       }
-}
-
-/*
- *
- * Put info to log, using key.
- * For now, just dump it out.
- * Later format into pretty lines.
- *
- */
-
-static int
-t_putinfo(const char *key, const char *info) {
-       int     rval;
-
-       /*
-        * For now.
-        */
-       rval = printf("%s:%s", key, info);
-       return(rval);
-}
-
-static char *
-t_getdate(char *buf, size_t buflen) {
-       size_t          n;
-       time_t          t;
-       struct tm       *p;
-#if defined(ISC_PLATFORM_USETHREADS) && !defined(WIN32)
-       struct tm       tm;
-#endif
-
-       t = time(NULL);
-#if defined(ISC_PLATFORM_USETHREADS) && !defined(WIN32)
-       p = localtime_r(&t, &tm);
-#else
-       p = localtime(&t);
-#endif
-       n = strftime(buf, buflen - 1, "%A %d %B %H:%M:%S %Y\n", p);
-       return(n != 0U ? buf : NULL);
-}
-
-/*
- * Some generally used utilities.
- */
-static const struct dns_errormap {
-       isc_result_t    result;
-       const char *text;
-} dns_errormap[] = {
-       { ISC_R_SUCCESS,                "ISC_R_SUCCESS"         },
-       { ISC_R_EXISTS,                 "ISC_R_EXISTS"          },
-       { ISC_R_NOTFOUND,               "ISC_R_NOTFOUND"        },
-       { ISC_R_NOSPACE,                "ISC_R_NOSPACE"         },
-       { ISC_R_UNEXPECTED,             "ISC_R_UNEXPECTED"      },
-       { ISC_R_UNEXPECTEDEND,          "ISC_R_UNEXPECTEDEND"   },
-       { ISC_R_RANGE,                  "ISC_R_RANGE"           },
-       { DNS_R_LABELTOOLONG,           "DNS_R_LABELTOOLONG"    },
-       { DNS_R_BADESCAPE,              "DNS_R_BADESCAPE"       },
-       /* { DNS_R_BADBITSTRING,        "DNS_R_BADBITSTRING"    }, */
-       /* { DNS_R_BITSTRINGTOOLONG,    "DNS_R_BITSTRINGTOOLONG"}, */
-       { DNS_R_EMPTYLABEL,             "DNS_R_EMPTYLABEL"      },
-       { DNS_R_BADDOTTEDQUAD,          "DNS_R_BADDOTTEDQUAD"   },
-       { DNS_R_UNKNOWN,                "DNS_R_UNKNOWN"         },
-       { DNS_R_BADLABELTYPE,           "DNS_R_BADLABELTYPE"    },
-       { DNS_R_BADPOINTER,             "DNS_R_BADPOINTER"      },
-       { DNS_R_TOOMANYHOPS,            "DNS_R_TOOMANYHOPS"     },
-       { DNS_R_DISALLOWED,             "DNS_R_DISALLOWED"      },
-       { DNS_R_EXTRATOKEN,             "DNS_R_EXTRATOKEN"      },
-       { DNS_R_EXTRADATA,              "DNS_R_EXTRADATA"       },
-       { DNS_R_TEXTTOOLONG,            "DNS_R_TEXTTOOLONG"     },
-       { DNS_R_SYNTAX,                 "DNS_R_SYNTAX"          },
-       { DNS_R_BADCKSUM,               "DNS_R_BADCKSUM"        },
-       { DNS_R_BADAAAA,                "DNS_R_BADAAAA"         },
-       { DNS_R_NOOWNER,                "DNS_R_NOOWNER"         },
-       { DNS_R_NOTTL,                  "DNS_R_NOTTL"           },
-       { DNS_R_BADCLASS,               "DNS_R_BADCLASS"        },
-       { DNS_R_PARTIALMATCH,           "DNS_R_PARTIALMATCH"    },
-       { DNS_R_NEWORIGIN,              "DNS_R_NEWORIGIN"       },
-       { DNS_R_UNCHANGED,              "DNS_R_UNCHANGED"       },
-       { DNS_R_BADTTL,                 "DNS_R_BADTTL"          },
-       { DNS_R_NOREDATA,               "DNS_R_NOREDATA"        },
-       { DNS_R_CONTINUE,               "DNS_R_CONTINUE"        },
-       { DNS_R_DELEGATION,             "DNS_R_DELEGATION"      },
-       { DNS_R_GLUE,                   "DNS_R_GLUE"            },
-       { DNS_R_DNAME,                  "DNS_R_DNAME"           },
-       { DNS_R_CNAME,                  "DNS_R_CNAME"           },
-       { DNS_R_NXDOMAIN,               "DNS_R_NXDOMAIN"        },
-       { DNS_R_NXRRSET,                "DNS_R_NXRRSET"         },
-       { DNS_R_BADDB,                  "DNS_R_BADDB"           },
-       { DNS_R_ZONECUT,                "DNS_R_ZONECUT"         },
-       { DNS_R_NOTZONETOP,             "DNS_R_NOTZONETOP"      },
-       { DNS_R_SEENINCLUDE,            "DNS_R_SEENINCLUDE"     },
-       { DNS_R_SINGLETON,              "DNS_R_SINGLETON"       },
-       { (isc_result_t)0, NULL }
-};
-
-isc_result_t
-t_dns_result_fromtext(char *name) {
-
-       isc_result_t                    result;
-       const struct dns_errormap       *pmap;
-
-       result = ISC_R_UNEXPECTED;
-
-       pmap = dns_errormap;
-       while (pmap->text != NULL) {
-               if (strcmp(name, pmap->text) == 0)
-                       break;
-               ++pmap;
-       }
-
-       if (pmap->text != NULL)
-               result = pmap->result;
-
-       return (result);
-}
-
-static const struct dc_method_map {
-       unsigned int    dc_method;
-       const char      *text;
-} dc_method_map[] = {
-
-       {       DNS_COMPRESS_NONE,      "DNS_COMPRESS_NONE"     },
-       {       DNS_COMPRESS_GLOBAL14,  "DNS_COMPRESS_GLOBAL14" },
-       {       DNS_COMPRESS_ALL,       "DNS_COMPRESS_ALL"      },
-       {       0,                      NULL                    }
-};
-
-unsigned int
-t_dc_method_fromtext(char *name) {
-       unsigned int                    dc_method;
-       const struct dc_method_map      *pmap;
-
-       dc_method = DNS_COMPRESS_NONE;
-
-       pmap = dc_method_map;
-       while (pmap->text != NULL) {
-               if (strcmp(name, pmap->text) == 0)
-                       break;
-               ++pmap;
-       }
-
-       if (pmap->text != NULL)
-               dc_method = pmap->dc_method;
-
-       return(dc_method);
-}
-
-int
-t_bustline(char *line, char **toks) {
-       int     cnt;
-       char    *p;
-
-       cnt = 0;
-       if (line && *line) {
-               while ((p = strtok(line, "\t")) && (cnt < T_MAXTOKS)) {
-                       *toks++ = p;
-                       line = NULL;
-                       ++cnt;
-               }
-       }
-       return(cnt);
-}
-
-static void
-printhelp(void) {
-       int             cnt;
-       testspec_t      *pts;
-
-       cnt = 1;
-       pts = &T_testlist[0];
-
-       printf("Available tests:\n");
-       while (pts->func_name) {
-               printf("\t%d\t%s\n", cnt, pts->func_name);
-               ++pts;
-               ++cnt;
-       }
-}
-
-static void
-printusage(void) {
-       printf("Usage:\n%s\n", Usage);
-}
-
-int
-t_eval(const char *filename, int (*func)(char **), int nargs) {
-       FILE            *fp;
-       char            *p;
-       int             line;
-       int             cnt;
-       int             result;
-       int             tresult;
-       int             nfails;
-       int             nprobs;
-       int             npass;
-       char            *tokens[T_MAXTOKS + 1];
-
-       tresult = T_UNTESTED;
-       npass = 0;
-       nfails = 0;
-       nprobs = 0;
-
-       fp = fopen(filename, "r");
-       if (fp != NULL) {
-               line = 0;
-               while ((p = t_fgetbs(fp)) != NULL) {
-
-                       ++line;
-
-                       /*
-                        * Skip comment lines.
-                        */
-                       if ((isspace((unsigned char)*p)) || (*p == '#')) {
-                               (void)free(p);
-                               continue;
-                       }
-
-                       cnt = t_bustline(p, tokens);
-                       if (cnt == nargs) {
-                               tresult = func(tokens);
-                               switch (tresult) {
-                               case T_PASS:
-                                       ++npass;
-                                       break;
-                               case T_FAIL:
-                                       ++nfails;
-                                       break;
-                               case T_SKIPPED:
-                               case T_UNTESTED:
-                                       break;
-                               default:
-                                       ++nprobs;
-                                       break;
-                               }
-                       } else {
-                               t_info("bad format in %s at line %d\n",
-                                               filename, line);
-                               ++nprobs;
-                       }
-
-                       (void)free(p);
-               }
-               (void)fclose(fp);
-       } else {
-               t_info("Missing datafile %s\n", filename);
-               ++nprobs;
-       }
-
-       result = T_UNRESOLVED;
-
-       if (nfails == 0 && nprobs == 0 && npass > 0)
-               result = T_PASS;
-       else if (nfails > 0)
-               result = T_FAIL;
-       else if (npass == 0)
-               result = tresult;
-
-       return (result);
-}
-
-#ifdef WIN32
-void
-t_settests(const testspec_t list[]) {
-       int                     tnum;
-       const testspec_t        *pts;
-
-       memset(T_testlist, 0, sizeof(T_testlist));
-
-       pts = &list[0];
-       for (tnum = 0; tnum < T_MAXTESTS - 1; pts++, tnum++) {
-               if (pts->pfv == NULL)
-                       break;
-               T_testlist[tnum] = *pts;
-       }
-}
-#endif
diff --git a/lib/tests/win32/DLLMain.c b/lib/tests/win32/DLLMain.c
deleted file mode 100644 (file)
index 8e4cd38..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2013  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$ */
-
-#include <windows.h>
-#include <signal.h>
-
-/*
- * Called when we enter the DLL
- */
-__declspec(dllexport) BOOL WINAPI DllMain(HINSTANCE hinstDLL,
-                                         DWORD fdwReason, LPVOID lpvReserved)
-{
-       switch (fdwReason) {
-       /*
-        * The DLL is loading due to process
-        * initialization or a call to LoadLibrary.
-        */
-       case DLL_PROCESS_ATTACH:
-               break;
-
-       /* The attached process creates a new thread.  */
-       case DLL_THREAD_ATTACH:
-               break;
-
-       /* The thread of the attached process terminates. */
-       case DLL_THREAD_DETACH:
-               break;
-
-       /*
-        * The DLL is unloading from a process due to
-        * process termination or a call to FreeLibrary.
-        */
-       case DLL_PROCESS_DETACH:
-               break;
-
-       default:
-               break;
-       }
-       return (TRUE);
-}
-
diff --git a/lib/tests/win32/libtests.def b/lib/tests/win32/libtests.def
deleted file mode 100644 (file)
index ed11153..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-LIBRARY libtests
-
-; Exported Functions
-EXPORTS
-t_assert
-t_bustline
-t_dc_method_fromtext
-t_dns_result_fromtext
-t_eval
-t_fgetbs
-t_getenv
-t_info
-t_main
-t_result
-t_settests
diff --git a/lib/tests/win32/libtests.dsp.in b/lib/tests/win32/libtests.dsp.in
deleted file mode 100644 (file)
index c638991..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-# Microsoft Developer Studio Project File - Name="libtests" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** DO NOT EDIT **
-
-# TARGTYPE "@PLATFORM@ (x86) Dynamic-Link Library" 0x0102
-
-CFG=libtests - @PLATFORM@ Release
-!MESSAGE This is not a valid makefile. To build this project using NMAKE,
-!MESSAGE use the Export Makefile command and run
-!MESSAGE 
-!MESSAGE NMAKE /f "libtests.mak".
-!MESSAGE 
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libtests.mak" CFG="libtests - @PLATFORM@ Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libtests - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
-!MESSAGE "libtests - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" @COPTY@ /FD /c
-# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 @LIBXML2_INC@ /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" @COPTY@ /FD /c
-# SUBTRACT CPP /X
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll @MACHINE@
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib /nologo /dll @MACHINE@ /out:"../../../Build/Release/libtests.dll"
-
-!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" @COPTY@ /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @LIBXML2_INC@ /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" /FR @COPTY@ /FD /GZ /c
-# SUBTRACT CPP /X
-# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug @MACHINE@ /pdbtype:sept
-# ADD LINK32 user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib /nologo /dll /debug @MACHINE@ /out:"../../../Build/Debug/libtests.dll" /pdbtype:sept
-
-!ENDIF 
-
-# Begin Target
-
-# Name "libtests - @PLATFORM@ Release"
-# Name "libtests - @PLATFORM@ Debug"
-# Begin Group "Source Files"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=..\t_api.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\DLLMain.c
-# End Source File
-# End Group
-# Begin Group "Header Files"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=..\include\tests\t_api.h
-# End Source File
-# End Group
-# Begin Group "Resource Files"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=.\libtests.def
-# End Source File
-# End Target
-# End Project
diff --git a/lib/tests/win32/libtests.dsw b/lib/tests/win32/libtests.dsw
deleted file mode 100644 (file)
index c9a15a1..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
-
-###############################################################################
-
-Project: "libtests"=.\libtests.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/lib/tests/win32/libtests.mak.in b/lib/tests/win32/libtests.mak.in
deleted file mode 100644 (file)
index 18b1734..0000000
+++ /dev/null
@@ -1,378 +0,0 @@
-# Microsoft Developer Studio Generated NMAKE File, Based on libtests.dsp
-!IF "$(CFG)" == ""
-CFG=libtests - @PLATFORM@ Release
-!MESSAGE No configuration specified. Defaulting to libtests - @PLATFORM@ Release.
-!ENDIF 
-
-!IF "$(CFG)" != "libtests - @PLATFORM@ Release" && "$(CFG)" != "libtests - @PLATFORM@ Debug"
-!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE
-!MESSAGE by defining the macro CFG on the command line. For example:
-!MESSAGE 
-!MESSAGE NMAKE /f "libtests.mak" CFG="libtests - @PLATFORM@ Release"
-!MESSAGE 
-!MESSAGE Possible choices for configuration are:
-!MESSAGE 
-!MESSAGE "libtests - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
-!MESSAGE "libtests - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Dynamic-Link Library")
-!MESSAGE 
-!ERROR An invalid configuration is specified.
-!ENDIF 
-
-!IF "$(OS)" == "Windows_NT"
-NULL=
-!ELSE 
-NULL=nul
-!ENDIF 
-
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-
-!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
-_VC_MANIFEST_INC=0
-_VC_MANIFEST_BASENAME=__VC80
-!ELSE
-_VC_MANIFEST_INC=1
-_VC_MANIFEST_BASENAME=__VC80.Debug
-!ENDIF
-
-####################################################
-# Specifying name of temporary resource file used only in incremental builds:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-_VC_MANIFEST_AUTO_RES=$(_VC_MANIFEST_BASENAME).auto.res
-!else
-_VC_MANIFEST_AUTO_RES=
-!endif
-
-####################################################
-# _VC_MANIFEST_EMBED_EXE - command to embed manifest in EXE:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-#MT_SPECIAL_RETURN=1090650113
-#MT_SPECIAL_SWITCH=-notify_resource_update
-MT_SPECIAL_RETURN=0
-MT_SPECIAL_SWITCH=
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
-if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
-rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
-link $** /out:$@ $(LFLAGS)
-
-!else
-
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;1
-
-!endif
-
-####################################################
-# _VC_MANIFEST_EMBED_DLL - command to embed manifest in DLL:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-#MT_SPECIAL_RETURN=1090650113
-#MT_SPECIAL_SWITCH=-notify_resource_update
-MT_SPECIAL_RETURN=0
-MT_SPECIAL_SWITCH=
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -out:$(_VC_MANIFEST_BASENAME).auto.manifest $(MT_SPECIAL_SWITCH) & \
-if "%ERRORLEVEL%" == "$(MT_SPECIAL_RETURN)" \
-rc /r $(_VC_MANIFEST_BASENAME).auto.rc & \
-link $** /out:$@ $(LFLAGS)
-
-!else
-
-_VC_MANIFEST_EMBED_EXE= \
-if exist $@.manifest mt.exe -manifest $@.manifest -outputresource:$@;2
-
-!endif
-####################################################
-# _VC_MANIFEST_CLEAN - command to clean resources files generated temporarily:
-
-!if "$(_VC_MANIFEST_INC)" == "1"
-
-_VC_MANIFEST_CLEAN=-del $(_VC_MANIFEST_BASENAME).auto.res \
-    $(_VC_MANIFEST_BASENAME).auto.rc \
-    $(_VC_MANIFEST_BASENAME).auto.manifest
-
-!else
-
-_VC_MANIFEST_CLEAN=
-
-!endif
-
-!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
-
-OUTDIR=.\Release
-INTDIR=.\Release
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "..\..\..\Build\Release\libtests.dll"
-
-!ELSE 
-
-ALL : "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\Build\Release\libtests.dll"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN"
-!ELSE 
-CLEAN :
-!ENDIF 
-       -@erase "$(INTDIR)\t_api.obj"
-       -@erase "$(INTDIR)\DLLMain.obj"
-       -@erase "$(INTDIR)\vc60.idb"
-       -@erase "$(OUTDIR)\libtests.exp"
-       -@erase "$(OUTDIR)\libtests.lib"
-       -@erase "..\..\..\Build\Release\libtests.dll"
-       -@$(_VC_MANIFEST_CLEAN)
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 @LIBXML2_INC@ /I "../../../lib/dns/win32/include" /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "NDEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" /Fp"$(INTDIR)\libtests.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
-MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libtests.bsc" 
-BSC32_SBRS= \
-       
-LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/Release/libisc.lib  ../../dns/win32/Release/libdns.lib /nologo /dll /incremental:no /pdb:"$(OUTDIR)\libtests.pdb" @MACHINE@ /def:".\libtests.def" /out:"../../../Build/Release/libtests.dll" /implib:"$(OUTDIR)\libtests.lib" 
-DEF_FILE= \
-       ".\libtests.def"
-LINK32_OBJS= \
-       "$(INTDIR)\t_api.obj" \
-       "$(INTDIR)\DLLMain.obj" \
-       "..\..\dns\win32\Release\libdns.lib" \
-       "..\..\isc\win32\Release\libisc.lib"
-
-"..\..\..\Build\Release\libtests.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-  $(_VC_MANIFEST_EMBED_DLL)
-
-!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
-
-OUTDIR=.\Debug
-INTDIR=.\Debug
-# Begin Custom Macros
-OutDir=.\Debug
-# End Custom Macros
-
-!IF "$(RECURSE)" == "0" 
-
-ALL : "..\..\..\Build\Debug\libtests.dll" "$(OUTDIR)\libtests.bsc"
-
-!ELSE 
-
-ALL : "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\Build\Debug\libtests.dll" "$(OUTDIR)\libtests.bsc"
-
-!ENDIF 
-
-!IF "$(RECURSE)" == "1" 
-CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN"
-!ELSE 
-CLEAN :
-!ENDIF 
-       -@erase "$(INTDIR)\t_api.obj"
-       -@erase "$(INTDIR)\t_api.sbr"
-       -@erase "$(INTDIR)\DLLMain.obj"
-       -@erase "$(INTDIR)\DLLMain.sbr"
-       -@erase "$(INTDIR)\vc60.idb"
-       -@erase "$(INTDIR)\vc60.pdb"
-       -@erase "$(OUTDIR)\libtests.bsc"
-       -@erase "$(OUTDIR)\libtests.exp"
-       -@erase "$(OUTDIR)\libtests.lib"
-       -@erase "$(OUTDIR)\libtests.pdb"
-       -@erase "..\..\..\Build\Debug\libtests.dll"
-       -@erase "..\..\..\Build\Debug\libtests.ilk"
-       -@$(_VC_MANIFEST_CLEAN)
-
-"$(OUTDIR)" :
-    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-
-CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od @LIBXML2_INC@ /I "./" /I "../../../" /I "include" /I "../include" /I "../../../lib/isc/win32" /I "../../../lib/isc/win32/include" /I "../../../lib/dns/include" /I "../../../lib/isc/include" /D "_DEBUG" /D "WIN32" /D "__STDC__" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBTESTS_EXPORTS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\libtests.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c 
-MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32 
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\libtests.bsc" 
-BSC32_SBRS= \
-       "$(INTDIR)\t_api.sbr" \
-       "$(INTDIR)\DLLMain.sbr"
-
-"$(OUTDIR)\libtests.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
-    $(BSC32) @<<
-  $(BSC32_FLAGS) $(BSC32_SBRS)
-<<
-
-LINK32=link.exe
-LINK32_FLAGS=user32.lib advapi32.lib ws2_32.lib ../../isc/win32/debug/libisc.lib ../../dns/win32/debug/libdns.lib /nologo /dll /incremental:yes /pdb:"$(OUTDIR)\libtests.pdb" /debug @MACHINE@ /def:".\libtests.def" /out:"../../../Build/Debug/libtests.dll" /implib:"$(OUTDIR)\libtests.lib" /pdbtype:sept 
-DEF_FILE= \
-       ".\libtests.def"
-LINK32_OBJS= \
-       "$(INTDIR)\t_api.obj" \
-       "$(INTDIR)\DLLMain.obj" \
-       "..\..\dns\win32\Debug\libdns.lib" \
-       "..\..\isc\win32\Debug\libisc.lib"
-
-"..\..\..\Build\Debug\libtests.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
-    $(LINK32) @<<
-  $(LINK32_FLAGS) $(LINK32_OBJS)
-<<
-  $(_VC_MANIFEST_EMBED_DLL)
-
-!ENDIF 
-
-.c{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.obj::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.c{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cpp{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-.cxx{$(INTDIR)}.sbr::
-   $(CPP) @<<
-   $(CPP_PROJ) $< 
-<<
-
-
-!IF "$(NO_EXTERNAL_DEPS)" != "1"
-!IF EXISTS("libtests.dep")
-!INCLUDE "libtests.dep"
-!ELSE 
-!MESSAGE Warning: cannot find "libtests.dep"
-!ENDIF 
-!ENDIF 
-
-
-!IF "$(CFG)" == "libtests - @PLATFORM@ Release" || "$(CFG)" == "libtests - @PLATFORM@ Debug"
-SOURCE=..\t_api.c
-
-!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
-
-
-"$(INTDIR)\t_api.obj" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
-
-
-"$(INTDIR)\t_api.obj"  "$(INTDIR)\t_api.sbr" : $(SOURCE) "$(INTDIR)"
-       $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF 
-
-SOURCE=.\DLLMain.c
-
-!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
-
-
-"$(INTDIR)\DLLMain.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
-
-
-"$(INTDIR)\DLLMain.obj"        "$(INTDIR)\DLLMain.sbr" : $(SOURCE) "$(INTDIR)"
-
-
-!ENDIF 
-
-!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
-
-"libdns - @PLATFORM@ Release" : 
-   cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" 
-   cd "..\..\tests\win32"
-
-"libdns - @PLATFORM@ ReleaseCLEAN" : 
-   cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN 
-   cd "..\..\tests\win32"
-
-!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
-
-"libdns - @PLATFORM@ Debug" : 
-   cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" 
-   cd "..\..\tests\win32"
-
-"libdns - @PLATFORM@ DebugCLEAN" : 
-   cd "..\..\dns\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN 
-   cd "..\..\tests\win32"
-
-!ENDIF 
-
-!IF  "$(CFG)" == "libtests - @PLATFORM@ Release"
-
-"libisc - @PLATFORM@ Release" : 
-   cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" 
-   cd "..\..\tests\win32"
-
-"libisc - @PLATFORM@ ReleaseCLEAN" : 
-   cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN 
-   cd "..\..\tests\win32"
-
-!ELSEIF  "$(CFG)" == "libtests - @PLATFORM@ Debug"
-
-"libisc - @PLATFORM@ Debug" : 
-   cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" 
-   cd "..\..\tests\win32"
-
-"libisc - @PLATFORM@ DebugCLEAN" : 
-   cd "..\..\isc\win32"
-   $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN 
-   cd "..\..\tests\win32"
-
-!ENDIF 
-
-
-!ENDIF 
-
-####################################################
-# Commands to generate initial empty manifest file and the RC file
-# that references it, and for generating the .res file:
-
-$(_VC_MANIFEST_BASENAME).auto.res : $(_VC_MANIFEST_BASENAME).auto.rc
-
-$(_VC_MANIFEST_BASENAME).auto.rc : $(_VC_MANIFEST_BASENAME).auto.manifest
-    type <<$@
-#include <winuser.h>
-1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest"
-<< KEEP
-
-$(_VC_MANIFEST_BASENAME).auto.manifest :
-    type <<$@
-<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
-<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
-</assembly>
-<< KEEP
diff --git a/lib/tests/win32/libtests.vcxproj.filters.in b/lib/tests/win32/libtests.vcxproj.filters.in
deleted file mode 100644 (file)
index d8af4d9..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="libtests.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="DLLMain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\t_api.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\tests\t_api.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/lib/tests/win32/libtests.vcxproj.in b/lib/tests/win32/libtests.vcxproj.in
deleted file mode 100644 (file)
index e4a5849..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|@PLATFORM@">
-      <Configuration>Debug</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|@PLATFORM@">
-      <Configuration>Release</Configuration>
-      <Platform>@PLATFORM@</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F6F08940-7597-4FEE-9CE0-E09A009C45A3}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>libtests</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>..\..\..\Build\$(Configuration)\</OutDir>
-    <IntDir>.\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTESTS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../dns/include;@LIBXML2_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>../../isc/win32/$(Configuration);../../dns/win32/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\libtests.def</ModuleDefinitionFile>
-      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>@INTRINSIC@</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTESTS_EXPORTS;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>./;../../../;include;../include;../../isc/win32;../../isc/win32/include;../../isc/include;../../dns/include;@LIBXML2_INC@%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <StringPooling>true</StringPooling>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>../../isc/win32/$(Configuration);../../dns/win32/$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>libisc.lib;libdns.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>.\libtests.def</ModuleDefinitionFile>
-      <ImportLibrary>.\$(Configuration)\$(ProjectName).lib</ImportLibrary>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <OutputFile>..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="libtests.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_api.c" />
-    <ClCompile Include="DLLMain.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\tests\t_api.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/lib/tests/win32/libtests.vcxproj.user b/lib/tests/win32/libtests.vcxproj.user
deleted file mode 100644 (file)
index 695b5c7..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-</Project>
\ No newline at end of file
index 414101a50c16c0a72f934baa5e4cf983bb23975b..07e4f6587948436639246a6a125365f683251f90 100644 (file)
 ./lib/samples/win32/update.vcxproj.filters.in  X       2014,2015
 ./lib/samples/win32/update.vcxproj.in          X       2014,2015,2016,2017
 ./lib/samples/win32/update.vcxproj.user                X       2014
-./lib/tests/Makefile.in                                MAKE    1998,1999,2000,2001,2003,2004,2007,2009,2012
-./lib/tests/T_testlist.imp                     X       2004
-./lib/tests/include/Makefile.in                        MAKE    1998,1999,2000,2001,2004,2007,2012
-./lib/tests/include/tests/Makefile.in          MAKE    1999,2000,2001,2004,2007,2012,2015
-./lib/tests/include/tests/t_api.h              C       1999,2000,2001,2004,2005,2006,2007,2010,2013,2014,2017
-./lib/tests/t_api.c                            C       1999,2000,2001,2002,2003,2004,2005,2007,2008,2009,2010,2013,2014,2016,2017
-./lib/tests/win32/DLLMain.c                    C       2013
-./lib/tests/win32/libtests.def                 X       2013
-./lib/tests/win32/libtests.dsp.in              X       2013
-./lib/tests/win32/libtests.dsw                 X       2013
-./lib/tests/win32/libtests.mak.in              X       2013
-./lib/tests/win32/libtests.vcxproj.filters.in  X       2013,2015
-./lib/tests/win32/libtests.vcxproj.in          X       2013,2015,2016,2017
-./lib/tests/win32/libtests.vcxproj.user                X       2013
 ./lib/win32/bindevt/bindevt.c                  C       2000,2001,2004,2007
 ./lib/win32/bindevt/bindevt.dsp.in             X       2001,2013
 ./lib/win32/bindevt/bindevt.dsw                        X       2001