From: Evan Hunt Date: Tue, 27 Feb 2018 06:17:33 +0000 (-0800) Subject: remove master test (duplicates lib/isc/tests/master_test) X-Git-Tag: v9.11.4rc1~76^2~16 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ae39f25a10c9dac11712e17977351c540aba2291;p=thirdparty%2Fbind9.git remove master test (duplicates lib/isc/tests/master_test) (cherry picked from commit 6717f31e10e7f62f017f48e2497cba6111b14c1b) (cherry picked from commit 36d08442bc641d9858922a37925a99d4e34c858b) --- diff --git a/bin/tests/.gitignore b/bin/tests/.gitignore index 68c70b00823..7026d30f385 100644 --- a/bin/tests/.gitignore +++ b/bin/tests/.gitignore @@ -9,7 +9,6 @@ t_db gsstest t_dst t_hashes -t_master t_mem t_names t_net diff --git a/bin/tests/Makefile.in b/bin/tests/Makefile.in index db32722ee44..43bdd557cd3 100644 --- a/bin/tests/Makefile.in +++ b/bin/tests/Makefile.in @@ -29,7 +29,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@ LIBS = @LIBS@ -SUBDIR = atomic db dst master mem hashes names net rbt resolver \ +SUBDIR = atomic db dst mem hashes names net rbt resolver \ sockaddr tasks timers system @PKCS11_TOOLS@ optional # Test programs that are built by default: diff --git a/bin/tests/master/Makefile.in b/bin/tests/master/Makefile.in deleted file mode 100644 index 82ee5126172..00000000000 --- a/bin/tests/master/Makefile.in +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (C) 1999-2002, 2004, 2007, 2009, 2012, 2014, 2016 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/. - -# $Id: Makefile.in,v 1.31 2009/12/05 23:31:40 each Exp $ - -srcdir = @srcdir@ -VPATH = @srcdir@ -top_srcdir = @top_srcdir@ - -@BIND9_MAKE_INCLUDES@ - -CINCLUDES = ${TEST_INCLUDES} ${DNS_INCLUDES} \ - ${ISC_INCLUDES} @DST_OPENSSL_INC@ - -CDEFINES = @CRYPTO@ -CWARNINGS = - -# Note that we do not want to use libtool for libt_api -DNSLIBS = ../../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ -ISCLIBS = ../../../lib/isc/libisc.@A@ - -DNSDEPLIBS = ../../../lib/dns/libdns.@A@ -ISCDEPLIBS = ../../../lib/isc/libisc.@A@ - -DEPLIBS = ${DNSDEPLIBS} ${ISCDEPLIBS} - -LIBS = ${DNSLIBS} ${ISCLIBS} @LIBS@ - -TLIB = ../../../lib/tests/libt_api.@A@ - -TARGETS = t_master@EXEEXT@ - -SRCS = t_master.c - -@BIND9_MAKE_RULES@ - -t_master@EXEEXT@: t_master.@O@ ${DEPLIBS} ${TLIB} - ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ t_master.@O@ ${TLIB} ${LIBS} - -test: t_master@EXEEXT@ - -@ ./t_master@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a - -testhelp: - @ ./t_master@EXEEXT@ -h - -clean distclean:: - rm -f ${TARGETS} diff --git a/bin/tests/master/dns_master_load_10_data b/bin/tests/master/dns_master_load_10_data deleted file mode 100644 index cfaa3fb331d..00000000000 --- a/bin/tests/master/dns_master_load_10_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 9 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master10.data test in ISC_R_SUCCESS diff --git a/bin/tests/master/dns_master_load_11_data b/bin/tests/master/dns_master_load_11_data deleted file mode 100644 index 7b667b273bf..00000000000 --- a/bin/tests/master/dns_master_load_11_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 11 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master11.data test in ISC_R_SUCCESS diff --git a/bin/tests/master/dns_master_load_1_data b/bin/tests/master/dns_master_load_1_data deleted file mode 100644 index fc92c748a3d..00000000000 --- a/bin/tests/master/dns_master_load_1_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 1 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master1.data test in ISC_R_SUCCESS diff --git a/bin/tests/master/dns_master_load_2_data b/bin/tests/master/dns_master_load_2_data deleted file mode 100644 index a6e44b34cc4..00000000000 --- a/bin/tests/master/dns_master_load_2_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 2 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master2.data test in ISC_R_UNEXPECTEDEND diff --git a/bin/tests/master/dns_master_load_3_data b/bin/tests/master/dns_master_load_3_data deleted file mode 100644 index 9dbdfb20aad..00000000000 --- a/bin/tests/master/dns_master_load_3_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 3 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master3.data test in DNS_R_NOOWNER diff --git a/bin/tests/master/dns_master_load_4_data b/bin/tests/master/dns_master_load_4_data deleted file mode 100644 index 66ad1ff36a5..00000000000 --- a/bin/tests/master/dns_master_load_4_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 4 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master4.data test in ISC_R_SUCCESS diff --git a/bin/tests/master/dns_master_load_5_data b/bin/tests/master/dns_master_load_5_data deleted file mode 100644 index 56e33ba7ad1..00000000000 --- a/bin/tests/master/dns_master_load_5_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 5 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master5.data test in DNS_R_BADCLASS diff --git a/bin/tests/master/dns_master_load_6_data b/bin/tests/master/dns_master_load_6_data deleted file mode 100644 index d14aa888929..00000000000 --- a/bin/tests/master/dns_master_load_6_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 6 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master6.data test in ISC_R_SUCCESS diff --git a/bin/tests/master/dns_master_load_7_data b/bin/tests/master/dns_master_load_7_data deleted file mode 100644 index dbe7ef9a644..00000000000 --- a/bin/tests/master/dns_master_load_7_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 7 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master7.data test in ISC_R_SUCCESS diff --git a/bin/tests/master/dns_master_load_8_data b/bin/tests/master/dns_master_load_8_data deleted file mode 100644 index b109d43b8de..00000000000 --- a/bin/tests/master/dns_master_load_8_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 8 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master8.data test in DNS_R_SEENINCLUDE diff --git a/bin/tests/master/dns_master_load_9_data b/bin/tests/master/dns_master_load_9_data deleted file mode 100644 index af36072a8d4..00000000000 --- a/bin/tests/master/dns_master_load_9_data +++ /dev/null @@ -1,12 +0,0 @@ -# -# test data for dns_master_load test 9 -# -# format is: -# masterfile origin class expected_result -# where -# masterfile name is the name of a file containing master data -# origin is the origin -# class is the zone's class -# expected_result is a text representation of a dns_result_t -# -master9.data test in DNS_R_BADCLASS diff --git a/bin/tests/master/master1.data b/bin/tests/master/master1.data deleted file mode 100644 index 9b8147407ce..00000000000 --- a/bin/tests/master/master1.data +++ /dev/null @@ -1,11 +0,0 @@ -$TTL 1000 -@ in soa localhost. postmaster.localhost. ( - 1993050801 ;serial - 3600 ;refresh - 1800 ;retry - 604800 ;expiration - 3600 ) ;minimum -a in ns ns.vix.com. -a in ns ns2vix.com. -a in ns ns3vix.com. -b in a 1.2.3.4 diff --git a/bin/tests/master/master10.data b/bin/tests/master/master10.data deleted file mode 100644 index 9ee052fca90..00000000000 --- a/bin/tests/master/master10.data +++ /dev/null @@ -1,7 +0,0 @@ -; -; the following black line contains spaces - -; -@ 300 IN A 10.0.0.1 - ; -; diff --git a/bin/tests/master/master11.data b/bin/tests/master/master11.data deleted file mode 100644 index 0aaec25ecf3..00000000000 --- a/bin/tests/master/master11.data +++ /dev/null @@ -1,6 +0,0 @@ -; -; The following serial number contains a leading 0 and a 9 so the -; we can catch cases where it is incorrectly treated as a octal -; number. -; -@ 300 IN SOA ns hostmaster 00090000 1200 3600 604800 300 diff --git a/bin/tests/master/master2.data b/bin/tests/master/master2.data deleted file mode 100644 index b8ca38dd0d9..00000000000 --- a/bin/tests/master/master2.data +++ /dev/null @@ -1,11 +0,0 @@ -$TTL 1000 -@ in soa localhost. postmaster.localhost. ( - 1993050801 ;serial - 3600 ;refresh - 1800 ;retry - 604800 ;expiration - 3600 ) ;minimum -a in ns -a in ns ns2vix.com. -a in ns ns3vix.com. -b in a 1.2.3.4 diff --git a/bin/tests/master/master3.data b/bin/tests/master/master3.data deleted file mode 100644 index 7283af61b67..00000000000 --- a/bin/tests/master/master3.data +++ /dev/null @@ -1,11 +0,0 @@ -$TTL 1000 - in soa localhost. postmaster.localhost. ( - 1993050801 ;serial - 3600 ;refresh - 1800 ;retry - 604800 ;expiration - 3600 ) ;minimum - in ns ns.vix.com - in ns ns2vix.com. -a in ns ns3vix.com. -b in a 1.2.3.4 diff --git a/bin/tests/master/master4.data b/bin/tests/master/master4.data deleted file mode 100644 index 3a694ea5e3b..00000000000 --- a/bin/tests/master/master4.data +++ /dev/null @@ -1,11 +0,0 @@ - -@ in soa localhost. postmaster.localhost. ( - 1993050801 ;serial - 3600 ;refresh - 1800 ;retry - 604800 ;expiration - 3600 ) ;minimum -a in ns ns.vix.com. -a in ns ns2vix.com. -a in ns ns3vix.com. -b in a 1.2.3.4 diff --git a/bin/tests/master/master5.data b/bin/tests/master/master5.data deleted file mode 100644 index 95234bdafd6..00000000000 --- a/bin/tests/master/master5.data +++ /dev/null @@ -1,11 +0,0 @@ -$TTL 1000 -@ in soa localhost. postmaster.localhost. ( - 1993050801 ;serial - 3600 ;refresh - 1800 ;retry - 604800 ;expiration - 3600 ) ;minimum -a any ns ns.vix.com. -a in ns ns2vix.com. -a in ns ns3vix.com. -b in a 1.2.3.4 diff --git a/bin/tests/master/master6.data b/bin/tests/master/master6.data deleted file mode 100644 index a9a37bbf8e1..00000000000 --- a/bin/tests/master/master6.data +++ /dev/null @@ -1,33 +0,0 @@ - -$TTL 1000 -@ in soa localhost. postmaster.localhost. ( - 1993050801 ;serial - 3600 ;refresh - 1800 ;retry - 604800 ;expiration - 3600 ) ;minimum - -secure1 3600 IN DNSKEY ( - FLAG2|FLAG4|FLAG5|NTYP3|FLAG8|FLAG9|FLAG10|FLAG11|SIG15 - 3 3 - ArT0a8FtOZWEONG2YQVl9+RA34op30JPz4NPEroCxm2yImT2 - 2OYggnPIzrgayyepgKU1PfTTypnJDTwrSrtISyEsj7tjM7/n - 03DP8VWSn0aLwpUuc7Sx9vtM1Wi+YeiA4Bv2Oz1VB9de4qql - sIq+KLn8J4wz95bGnJ0mHUB7oTDJ3Hl1zeaCMdX69Kr46yAY - AvGJJdGGDYxYgxzx2zNdzypkYSkxpdsNqUt38tabSfdvCn12 - pnmSWjlVJsjHhsaYnrPhouN5acOXMNbxNVbGU5LZ8Es6EYbV - /7YMt8VUkA8/8UCszBBT7XAJ3OFjiMO8mvxrZZFzvwJlPBQ1 - oFq/TNZlSe+N ) - -secure2 3600 in DNSKEY ( - flag2|flag4|flag5|ntyp3|flag8|flag9|flag10|flag11|sig15 - 3 3 - ArT0a8FtOZWEONG2YQVl9+RA34op30JPz4NPEroCxm2yImT2 - 2OYggnPIzrgayyepgKU1PfTTypnJDTwrSrtISyEsj7tjM7/n - 03DP8VWSn0aLwpUuc7Sx9vtM1Wi+YeiA4Bv2Oz1VB9de4qql - sIq+KLn8J4wz95bGnJ0mHUB7oTDJ3Hl1zeaCMdX69Kr46yAY - AvGJJdGGDYxYgxzx2zNdzypkYSkxpdsNqUt38tabSfdvCn12 - pnmSWjlVJsjHhsaYnrPhouN5acOXMNbxNVbGU5LZ8Es6EYbV - /7YMt8VUkA8/8UCszBBT7XAJ3OFjiMO8mvxrZZFzvwJlPBQ1 - oFq/TNZlSe+N ) - diff --git a/bin/tests/master/master7.data b/bin/tests/master/master7.data deleted file mode 100644 index 2638b5d77b3..00000000000 --- a/bin/tests/master/master7.data +++ /dev/null @@ -1,17 +0,0 @@ - -$TTL 1000 -@ in soa localhost. postmaster.localhost. ( - 1993050801 ;serial - 3600 ;refresh - 1800 ;retry - 604800 ;expiration - 3600 ) ;minimum - -secure1 3600 IN DNSKEY ( - NOKEY|FLAG2|FLAG4|FLAG5|NTYP3|FLAG8|FLAG9|FLAG10|FLAG11|SIG15 - 3 3 ) - -secure2 3600 in DNSKEY ( - nokey|flag2|flag4|flag5|ntyp3|flag8|flag9|flag10|flag11|sig15 - 3 3 ) - diff --git a/bin/tests/master/master8.data b/bin/tests/master/master8.data deleted file mode 100644 index 58bded95832..00000000000 --- a/bin/tests/master/master8.data +++ /dev/null @@ -1,4 +0,0 @@ -; -; master7.data contains a good zone file -; -$include master7.data diff --git a/bin/tests/master/master9.data b/bin/tests/master/master9.data deleted file mode 100644 index e7bcf7e2ef6..00000000000 --- a/bin/tests/master/master9.data +++ /dev/null @@ -1,4 +0,0 @@ -; -; master5.data is bad -; -$include master5.data diff --git a/bin/tests/master/t_master.c b/bin/tests/master/t_master.c deleted file mode 100644 index 3d0a4595d38..00000000000 --- a/bin/tests/master/t_master.c +++ /dev/null @@ -1,334 +0,0 @@ -/* - * Copyright (C) 1998-2001, 2003-2005, 2007, 2009, 2011, 2013, 2016, 2017 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/. - */ - -/* $Id: t_master.c,v 1.41 2011/03/12 04:59:46 tbox Exp $ */ - -#include - -#include -#include - -#include -#include -#include /* Required for HP/UX (and others?) */ -#include - -#include -#include -#include -#include -#include -#include - -#include - -#define BUFLEN 255 -#define BIGBUFLEN (64 * 1024) - -static isc_result_t -t1_add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset); - -isc_mem_t *T1_mctx; -char *Tokens[T_MAXTOKS + 1]; - -static isc_result_t -t1_add_callback(void *arg, dns_name_t *owner, dns_rdataset_t *dataset) { - char buf[BIGBUFLEN]; - isc_buffer_t target; - isc_result_t result; - - UNUSED(arg); - - isc_buffer_init(&target, buf, BIGBUFLEN); - result = dns_rdataset_totext(dataset, owner, ISC_FALSE, ISC_FALSE, - &target); - if (result != ISC_R_SUCCESS) - t_info("dns_rdataset_totext: %s\n", dns_result_totext(result)); - - return(result); -} - -static int -test_master(char *testfile, char *origin, char *db_class, - isc_result_t exp_result) -{ - int result; - int len; - isc_result_t isc_result; - isc_result_t dns_result; - dns_name_t dns_origin; - isc_buffer_t source; - isc_buffer_t target; - unsigned char name_buf[BUFLEN]; - dns_rdatacallbacks_t callbacks; - dns_rdataclass_t rdataclass; - isc_textregion_t textregion; - - if (T1_mctx == NULL) - isc_result = isc_mem_create(0, 0, &T1_mctx); - else - isc_result = ISC_R_SUCCESS; - if (isc_result != ISC_R_SUCCESS) { - t_info("isc_mem_create failed %d\n", isc_result); - return(T_UNRESOLVED); - } - - len = strlen(origin); - isc_buffer_init(&source, origin, len); - isc_buffer_add(&source, len); - isc_buffer_setactive(&source, len); - isc_buffer_init(&target, name_buf, BUFLEN); - dns_name_init(&dns_origin, NULL); - dns_result = dns_name_fromtext(&dns_origin, &source, dns_rootname, - 0, &target); - if (dns_result != ISC_R_SUCCESS) { - t_info("dns_name_fromtext failed %s\n", - dns_result_totext(dns_result)); - return(T_UNRESOLVED); - } - - dns_rdatacallbacks_init_stdio(&callbacks); - callbacks.add = t1_add_callback; - - textregion.base = db_class; - textregion.length = strlen(db_class); - - dns_result = dns_rdataclass_fromtext(&rdataclass, &textregion); - if (dns_result != ISC_R_SUCCESS) { - t_info("dns_rdataclass_fromtext failed %s\n", - dns_result_totext(dns_result)); - return(T_UNRESOLVED); - } - - dns_result = dns_master_loadfile( testfile, - &dns_origin, - &dns_origin, - rdataclass, - ISC_TRUE, - &callbacks, - T1_mctx); - - if (dns_result == exp_result) - result = T_PASS; - else { - t_info("dns_master_loadfile: got %s, expected %s\n", - dns_result_totext(dns_result), - dns_result_totext(exp_result)); - result = T_FAIL; - } - return(result); -} - -static int -test_master_x(const char *filename) { - FILE *fp; - char *p; - int line; - int cnt; - int result; - - result = T_UNRESOLVED; - - fp = fopen(filename, "r"); - if (fp != NULL) { - line = 0; - while ((p = t_fgetbs(fp)) != NULL) { - - ++line; - - /* - * Skip comment lines. - */ - if ((isspace(*p & 0xff)) || (*p == '#')) { - (void)free(p); - continue; - } - - /* - * Name of data file, origin, zclass, expected result. - */ - cnt = t_bustline(p, Tokens); - if (cnt == 4) { - result = test_master(Tokens[0], Tokens[1], - Tokens[2], - t_dns_result_fromtext(Tokens[3])); - } else { - t_info("bad format in %s at line %d\n", - filename, line); - } - - (void)free(p); - } - (void)fclose(fp); - } else { - t_info("Missing datafile %s\n", filename); - } - return(result); -} - -static const char *a1 = "dns_master_loadfile loads a valid master file and " - "returns ISC_R_SUCCESS"; -static void -t1(void) { - int result; - t_assert("dns_master_loadfile", 1, T_REQUIRED, "%s", a1); - result = test_master_x("dns_master_load_1_data"); - t_result(result); -} - -static const char *a2 = - "dns_master_loadfile returns ISC_R_UNEXPECTEDEND when the " - "masterfile input ends unexpectedly"; - -static void -t2(void) { - int result; - t_assert("dns_master_loadfile", 2, T_REQUIRED, "%s", a2); - result = test_master_x("dns_master_load_2_data"); - t_result(result); -} - -static const char *a3 = "dns_master_loadfile returns DNS_R_NOOWNER when the " - "an ownername is not specified"; - -static void -t3() { - int result; - t_assert("dns_master_loadfile", 3, T_REQUIRED, "%s", a3); - result = test_master_x("dns_master_load_3_data"); - t_result(result); -} - -static const char *a4 = "dns_master_loadfile accepts broken zone files " - "where the first record has an undefined TTL, " - "as long as it is a SOA"; - -static void -t4() { - int result; - t_assert("dns_master_loadfile", 4, T_REQUIRED, "%s", a4); - result = test_master_x("dns_master_load_4_data"); - t_result(result); -} - -static const char *a5 = "dns_master_loadfile returns DNS_R_BADCLASS when the " - "the record class did not match the zone class"; - -static void -t5() { - int result; - - t_assert("dns_master_loadfile", 5, T_REQUIRED, "%s", a5); - result = test_master_x("dns_master_load_5_data"); - - t_result(result); -} - -static const char *a6 = - "dns_master_loadfile understands DNSKEY RR specifications " - "containing key material"; - -static void -t6() { - int result; - - t_assert("dns_master_loadfile", 6, T_REQUIRED, "%s", a6); - result = test_master_x("dns_master_load_6_data"); - - t_result(result); -} - -static const char *a7 = - "dns_master_loadfile understands DNSKEY RR specifications " - "containing no key material"; - -static void -t7() { - int result; - - t_assert("dns_master_loadfile", 7, T_REQUIRED, "%s", a7); - result = test_master_x("dns_master_load_7_data"); - - t_result(result); -} - -static const char *a8 = - "dns_master_loadfile understands $INCLUDE"; - -static void -t8() { - int result; - - t_assert("dns_master_loadfile", 8, T_REQUIRED, "%s", a8); - result = test_master_x("dns_master_load_8_data"); - - t_result(result); -} - -static const char *a9 = - "dns_master_loadfile understands $INCLUDE with failure"; - -static void -t9() { - int result; - - t_assert("dns_master_loadfile", 9, T_REQUIRED, "%s", a9); - result = test_master_x("dns_master_load_9_data"); - - t_result(result); -} - -static const char *a10 = - "dns_master_loadfile non-empty blank lines"; - -static void -t10() { - int result; - - t_assert("dns_master_loadfile", 10, T_REQUIRED, "%s", a10); - result = test_master_x("dns_master_load_10_data"); - - t_result(result); -} - -static const char *a11 = - "dns_master_loadfile allow leading zeros in SOA"; - -static void -t11() { - int result; - - t_assert("dns_master_loadfile", 11, T_REQUIRED, "%s", a11); - result = test_master_x("dns_master_load_11_data"); - - t_result(result); -} - - -testspec_t T_testlist[] = { - { (PFV) t1, "ISC_R_SUCCESS" }, - { (PFV) t2, "ISC_R_UNEXPECTEDEND" }, - { (PFV) t3, "DNS_NOOWNER" }, - { (PFV) t4, "DNS_NOTTL" }, - { (PFV) t5, "DNS_BADCLASS" }, - { (PFV) t6, "DNSKEY RR 1" }, - { (PFV) t7, "DNSKEY RR 2" }, - { (PFV) t8, "$INCLUDE" }, - { (PFV) t9, "$INCLUDE w/ DNS_BADCLASS" }, - { (PFV) t10, "non empty blank lines" }, - { (PFV) t11, "leading zeros in serial" }, - { (PFV) 0, NULL } -}; - -#ifdef WIN32 -int -main(int argc, char **argv) { - t_settests(T_testlist); - return (t_main(argc, argv)); -} -#endif diff --git a/bin/tests/master/win32/t_master.dsp.in b/bin/tests/master/win32/t_master.dsp.in deleted file mode 100644 index 0a2a859fca5..00000000000 --- a/bin/tests/master/win32/t_master.dsp.in +++ /dev/null @@ -1,95 +0,0 @@ -# Microsoft Developer Studio Project File - Name="t_master" - Package Owner=<4> -# Microsoft Developer Studio Generated Build File, Format Version 6.00 -# ** DO NOT EDIT ** - -# TARGTYPE "@PLATFORM@ (x86) Console Application" 0x0103 - -CFG=t_master - @PLATFORM@ Debug -!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 "t_master.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 "t_master.mak" CFG="t_master - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_master - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_master - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE - -# Begin Project -# PROP AllowPerConfigDependencies 0 -# PROP Scc_ProjName "" -# PROP Scc_LocalPath "" -CPP=cl.exe -RSC=rc.exe - -!IF "$(CFG)" == "t_master - @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 /W3 @COPTX@ @COPTI@ /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# ADD CPP /nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /c -# 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 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 /subsystem:console @MACHINE@ -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib /nologo /subsystem:console @MACHINE@ /out:"../../../../Build/Release/t_master.exe" - -!ELSEIF "$(CFG)" == "t_master - @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 /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" @COPTY@ /FD /GZ /c -# ADD CPP /nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /I "../../../../lib/bind9/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR /FD /GZ /c -# SUBTRACT CPP /X @COPTY@ -# 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 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 /subsystem:console /debug @MACHINE@ /pdbtype:sept -# ADD LINK32 @LIBXML2_LIB@ user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib /nologo /subsystem:console /map /debug @MACHINE@ /out:"../../../../Build/Debug/t_master.exe" /pdbtype:sept - -!ENDIF - -# Begin Target - -# Name "t_master - @PLATFORM@ Release" -# Name "t_master - @PLATFORM@ Debug" -# Begin Group "Source Files" - -# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -# Begin Source File - -SOURCE=..\t_master.c -# End Source File -# End Group -# End Target -# End Project diff --git a/bin/tests/master/win32/t_master.dsw b/bin/tests/master/win32/t_master.dsw deleted file mode 100644 index 1d7ef5b9aa5..00000000000 --- a/bin/tests/master/win32/t_master.dsw +++ /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: "t_master"=".\t_master.dsp" - Package Owner=<4> - -Package=<5> -{{{ -}}} - -Package=<4> -{{{ -}}} - -############################################################################### - -Global: - -Package=<5> -{{{ -}}} - -Package=<3> -{{{ -}}} - -############################################################################### - diff --git a/bin/tests/master/win32/t_master.mak.in b/bin/tests/master/win32/t_master.mak.in deleted file mode 100644 index cc88fa53754..00000000000 --- a/bin/tests/master/win32/t_master.mak.in +++ /dev/null @@ -1,375 +0,0 @@ -# Microsoft Developer Studio Generated NMAKE File, Based on t_master.dsp -!IF "$(CFG)" == "" -CFG=t_master - @PLATFORM@ Debug -!MESSAGE No configuration specified. Defaulting to t_master - @PLATFORM@ Debug. -!ENDIF - -!IF "$(CFG)" != "t_master - @PLATFORM@ Release" && "$(CFG)" != "t_master - @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 "t_master.mak" CFG="t_master - @PLATFORM@ Debug" -!MESSAGE -!MESSAGE Possible choices for configuration are: -!MESSAGE -!MESSAGE "t_master - @PLATFORM@ Release" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE "t_master - @PLATFORM@ Debug" (based on "@PLATFORM@ (x86) Console Application") -!MESSAGE -!ERROR An invalid configuration is specified. -!ENDIF - -!IF "$(OS)" == "Windows_NT" -NULL= -!ELSE -NULL=nul -!ENDIF - -CPP=cl.exe -RSC=rc.exe -LIBXML=@LIBXML2_LIB@ - -!IF "$(CFG)" == "t_master - @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)" == "t_master - @PLATFORM@ Release" - -OUTDIR=.\Release -INTDIR=.\Release - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Release\t_master.exe" - -!ELSE - -ALL : "libtests - @PLATFORM@ Release" "libisc - @PLATFORM@ Release" "libdns - @PLATFORM@ Release" "..\..\..\..\Build\Release\t_master.exe" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ ReleaseCLEAN" "libisc - @PLATFORM@ ReleaseCLEAN" "libtests - @PLATFORM@ ReleaseCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_master.obj" - -@erase "$(INTDIR)\vc60.idb" - -@erase "..\..\..\..\Build\Release\t_master.exe" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MD /W3 @COPTX@ @COPTI@ /O2 /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "NDEBUG" /D "__STDC__" /D "_CONSOLE" /D "_MBCS" /Fp"$(INTDIR)\t_master.pch" @COPTY@ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_master.bsc" -BSC32_SBRS= \ - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Release/libisc.lib ../../../../lib/dns/win32/Release/libdns.lib ../../../../lib/tests/win32/Release/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:no /pdb:"$(OUTDIR)\t_master.pdb" @MACHINE@ /out:"../../../../Build/Release/t_master.exe" -LINK32_OBJS= \ - "$(INTDIR)\t_master.obj" \ - "..\..\..\..\lib\dns\win32\Release\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Release\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Release\libtests.lib" - -"..\..\..\..\Build\Release\t_master.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - -OUTDIR=.\Debug -INTDIR=.\Debug -# Begin Custom Macros -OutDir=.\Debug -# End Custom Macros - -!IF "$(RECURSE)" == "0" - -ALL : "..\..\..\..\Build\Debug\t_master.exe" "$(OUTDIR)\t_master.bsc" - -!ELSE - -ALL : "libtests - @PLATFORM@ Debug" "libisc - @PLATFORM@ Debug" "libdns - @PLATFORM@ Debug" "..\..\..\..\Build\Debug\t_master.exe" "$(OUTDIR)\t_master.bsc" - -!ENDIF - -!IF "$(RECURSE)" == "1" -CLEAN :"libdns - @PLATFORM@ DebugCLEAN" "libisc - @PLATFORM@ DebugCLEAN" "libtests - @PLATFORM@ DebugCLEAN" -!ELSE -CLEAN : -!ENDIF - -@erase "$(INTDIR)\t_master.obj" - -@erase "$(INTDIR)\t_master.sbr" - -@erase "$(INTDIR)\vc60.idb" - -@erase "$(INTDIR)\vc60.pdb" - -@erase "$(OUTDIR)\t_master.bsc" - -@erase "$(OUTDIR)\t_master.map" - -@erase "$(OUTDIR)\t_master.pdb" - -@erase "..\..\..\..\Build\Debug\t_master.exe" - -@erase "..\..\..\..\Build\Debug\t_master.ilk" - -@$(_VC_MANIFEST_CLEAN) - -"$(OUTDIR)" : - if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)" - -CPP_PROJ=/nologo /MDd /W3 /Gm @COPTX@ @COPTI@ /ZI /Od /I "./" /I "../../../../" @LIBXML2_INC@ @OPENSSL_INC@ /I "../../../../lib/isc/win32" /I "../../../../lib/isc/win32/include" /I "../../../../lib/isc/include" /I "../../../../lib/dns/win32/include" /I "../../../../lib/dns/include" /I "../../../../lib/tests/include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "i386" /FR"$(INTDIR)\\" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /GZ /c -BSC32=bscmake.exe -BSC32_FLAGS=/nologo /o"$(OUTDIR)\t_master.bsc" -BSC32_SBRS= \ - "$(INTDIR)\t_master.sbr" - -"$(OUTDIR)\t_master.bsc" : "$(OUTDIR)" $(BSC32_SBRS) - $(BSC32) @<< - $(BSC32_FLAGS) $(BSC32_SBRS) -<< - -LINK32=link.exe -LINK32_FLAGS=user32.lib advapi32.lib kernel32.lib ws2_32.lib ../../../../lib/isc/win32/Debug/libisc.lib ../../../../lib/dns/win32/Debug/libdns.lib ../../../../lib/tests/win32/Debug/libtests.lib $(LIBXML) /nologo /subsystem:console /incremental:yes /pdb:"$(OUTDIR)\t_master.pdb" /map:"$(INTDIR)\t_master.map" /debug @MACHINE@ /out:"../../../../Build/Debug/t_master.exe" /pdbtype:sept -LINK32_OBJS= \ - "$(INTDIR)\t_master.obj" \ - "..\..\..\..\lib\dns\win32\Debug\libdns.lib" \ - "..\..\..\..\lib\isc\win32\Debug\libisc.lib" \ - "..\..\..\..\lib\tests\win32\Debug\libtests.lib" - -"..\..\..\..\Build\Debug\t_master.exe" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS) - $(LINK32) @<< - $(LINK32_FLAGS) $(LINK32_OBJS) -<< - $(_VC_MANIFEST_EMBED_EXE) - -!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("t_master.dep") -!INCLUDE "t_master.dep" -!ELSE -!MESSAGE Warning: cannot find "t_master.dep" -!ENDIF -!ENDIF - - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" || "$(CFG)" == "t_master - @PLATFORM@ Debug" -SOURCE=..\t_master.c - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" - - -"$(INTDIR)\t_master.obj" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - - -"$(INTDIR)\t_master.obj" "$(INTDIR)\t_master.sbr" : $(SOURCE) "$(INTDIR)" - $(CPP) $(CPP_PROJ) $(SOURCE) - - -!ENDIF - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" - -"libdns - @PLATFORM@ Release" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" - cd "..\..\..\bin\tests\master\win32" - -"libdns - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - -"libdns - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\master\win32" - -"libdns - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\dns\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libdns.mak" CFG="libdns - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ENDIF - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" - -"libisc - @PLATFORM@ Release" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" - cd "..\..\..\bin\tests\master\win32" - -"libisc - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - -"libisc - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\master\win32" - -"libisc - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\isc\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libisc.mak" CFG="libisc - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ENDIF - -!IF "$(CFG)" == "t_master - @PLATFORM@ Release" - -"libtests - @PLATFORM@ Release" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" - cd "..\..\..\bin\tests\master\win32" - -"libtests - @PLATFORM@ ReleaseCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Release" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\win32" - -!ELSEIF "$(CFG)" == "t_master - @PLATFORM@ Debug" - -"libtests - @PLATFORM@ Debug" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" - cd "..\..\..\bin\tests\master\win32" - -"libtests - @PLATFORM@ DebugCLEAN" : - cd "..\..\..\..\lib\tests\win32" - $(MAKE) /$(MAKEFLAGS) /F ".\libtests.mak" CFG="libtests - @PLATFORM@ Debug" RECURSE=1 CLEAN - cd "..\..\..\bin\tests\master\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 -1RT_MANIFEST"$(_VC_MANIFEST_BASENAME).auto.manifest" -<< KEEP - -$(_VC_MANIFEST_BASENAME).auto.manifest : - type <<$@ - - - -<< KEEP diff --git a/bin/tests/master/win32/t_master.vcxproj.filters.in b/bin/tests/master/win32/t_master.vcxproj.filters.in deleted file mode 100644 index b3a38285a1d..00000000000 --- a/bin/tests/master/win32/t_master.vcxproj.filters.in +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - \ No newline at end of file diff --git a/bin/tests/master/win32/t_master.vcxproj.in b/bin/tests/master/win32/t_master.vcxproj.in deleted file mode 100644 index 2fb1bab8139..00000000000 --- a/bin/tests/master/win32/t_master.vcxproj.in +++ /dev/null @@ -1,110 +0,0 @@ - - - - - Debug - @PLATFORM@ - - - Release - @PLATFORM@ - - - - {5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E} - Win32Proj - t_master - - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - true - ..\..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - - - false - ..\..\..\..\Build\$(Configuration)\ - .\$(Configuration)\ - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - true - .\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - true - ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - Level3 - - - MaxSpeed - true - @INTRINSIC@ - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - OnlyExplicitInline - false - true - .\$(Configuration)\$(TargetName).pch - .\$(Configuration)\ - .\$(Configuration)\ - $(OutDir)$(TargetName).pdb - .\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories) - CompileAsC - - - Console - false - true - true - ..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt) - Default - ..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories) - @LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies) - - - - - - - - - diff --git a/bin/tests/master/win32/t_master.vcxproj.user b/bin/tests/master/win32/t_master.vcxproj.user deleted file mode 100644 index 695b5c78b91..00000000000 --- a/bin/tests/master/win32/t_master.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/configure b/configure index 176703827c7..6c97bbe3ac6 100755 --- a/configure +++ b/configure @@ -23871,7 +23871,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/dnssec-keymgr.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/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_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/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rsabigexponent/Makefile 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/isccfg/tests/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/dnssec-keymgr.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/keymgr.py bin/python/isc/keyseries.py bin/python/isc/keyzone.py bin/python/isc/policy.py bin/python/isc/rndc.py bin/python/isc/tests/dnskey_test.py bin/python/isc/tests/policy_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/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/dlzexternal/Makefile bin/tests/system/dlzexternal/ns1/dlzs.conf bin/tests/system/dyndb/Makefile bin/tests/system/dyndb/driver/Makefile bin/tests/system/inline/checkdsa.sh bin/tests/system/lwresd/Makefile bin/tests/system/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rsabigexponent/Makefile 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/isccfg/tests/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" # @@ -24924,7 +24924,6 @@ do "bin/tests/dst/t2_rsasig") CONFIG_FILES="$CONFIG_FILES bin/tests/dst/t2_rsasig" ;; "bin/tests/hashes/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/hashes/Makefile" ;; "bin/tests/headerdep_test.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/headerdep_test.sh" ;; - "bin/tests/master/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/master/Makefile" ;; "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" ;; diff --git a/configure.in b/configure.in index 88207400a68..a611266c689 100644 --- a/configure.in +++ b/configure.in @@ -5445,7 +5445,6 @@ AC_CONFIG_FILES([ 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 diff --git a/util/copyrights b/util/copyrights index b5680fe1fcc..1fc8fa4368e 100644 --- a/util/copyrights +++ b/util/copyrights @@ -568,37 +568,6 @@ ./bin/tests/lwres_test.c C 2000,2001,2004,2005,2007,2015,2016 ./bin/tests/lwresconf_test.c C 2000,2001,2004,2007,2015,2016 ./bin/tests/makejournal.c C 2013,2015,2016,2017 -./bin/tests/master/Makefile.in MAKE 1999,2000,2001,2002,2004,2007,2009,2012,2014,2016 -./bin/tests/master/dns_master_load_10_data X 2000,2001 -./bin/tests/master/dns_master_load_11_data X 2000,2001 -./bin/tests/master/dns_master_load_1_data X 1999,2000,2001 -./bin/tests/master/dns_master_load_2_data X 1999,2000,2001 -./bin/tests/master/dns_master_load_3_data X 1999,2000,2001 -./bin/tests/master/dns_master_load_4_data X 1999,2000,2001 -./bin/tests/master/dns_master_load_5_data X 1999,2000,2001 -./bin/tests/master/dns_master_load_6_data X 1999,2000,2001 -./bin/tests/master/dns_master_load_7_data X 1999,2000,2001 -./bin/tests/master/dns_master_load_8_data X 2000,2001 -./bin/tests/master/dns_master_load_9_data X 2000,2001 -./bin/tests/master/master1.data X 1999,2000,2001 -./bin/tests/master/master10.data X 2000,2001 -./bin/tests/master/master11.data X 2000,2001 -./bin/tests/master/master2.data X 1999,2000,2001 -./bin/tests/master/master3.data X 1999,2000,2001 -./bin/tests/master/master4.data X 1999,2000,2001 -./bin/tests/master/master5.data X 1999,2000,2001 -./bin/tests/master/master6.data X 1999,2000,2001,2003 -./bin/tests/master/master7.data X 1999,2000,2001,2003 -./bin/tests/master/master8.data X 2000,2001 -./bin/tests/master/master9.data X 2000,2001 -./bin/tests/master/t_master.c C 1998,1999,2000,2001,2003,2004,2005,2007,2009,2011,2013,2016,2017 -./bin/tests/master/win32/t_master.dsp.in X 2013,2016 -./bin/tests/master/win32/t_master.dsw X 2013 -./bin/tests/master/win32/t_master.mak.in X 2013,2016 -./bin/tests/master/win32/t_master.vcxproj.filters.in X 2013,2015 -./bin/tests/master/win32/t_master.vcxproj.in X 2013,2015,2016,2017 -./bin/tests/master/win32/t_master.vcxproj.user X 2013 -./bin/tests/master_test.c C 1999,2000,2001,2004,2007,2009,2015,2016 ./bin/tests/mem/Makefile.in MAKE 1998,1999,2000,2001,2002,2004,2005,2007,2009,2012,2014,2016 ./bin/tests/mem/t_mem.c C 1999,2000,2001,2004,2007,2009,2013,2016,1018 ./bin/tests/mem/win32/t_mem.dsp.in X 2013 diff --git a/win32utils/Configure b/win32utils/Configure index c599200843c..164b5d9e7b3 100644 --- a/win32utils/Configure +++ b/win32utils/Configure @@ -290,8 +290,6 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj", "..\\bin\\tests\\db\\win32\\t_db.vcxproj.filters", "..\\bin\\tests\\dst\\win32\\t_dst.vcxproj", "..\\bin\\tests\\dst\\win32\\t_dst.vcxproj.filters", - "..\\bin\\tests\\master\\win32\\t_master.vcxproj", - "..\\bin\\tests\\master\\win32\\t_master.vcxproj.filters", "..\\bin\\tests\\mem\\win32\\t_mem.vcxproj", "..\\bin\\tests\\mem\\win32\\t_mem.vcxproj.filters", "..\\bin\\tests\\hashes\\win32\\t_hashes.vcxproj", diff --git a/win32utils/bind9.sln.in b/win32utils/bind9.sln.in index e2a9c00050f..b0f27fba079 100644 --- a/win32utils/bind9.sln.in +++ b/win32utils/bind9.sln.in @@ -533,14 +533,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_dst", "..\bin\tests\dst\w {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7} = {B4AC7F81-E3DC-43E9-B339-4FA5149FA8F7} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_master", "..\bin\tests\master\win32\t_master.vcxproj", "{5DC2F8D3-9373-41BB-B3AB-78F2E12F1E5E}" - ProjectSection(ProjectDependencies) = postProject - {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} = {A3F71D12-F38A-4C77-8D87-8E8854CA74A1} - {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF} - {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} = {5FEBFD4E-CCB0-48B9-B733-E15EEB85C16A} - {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_mem", "..\bin\tests\mem\win32\t_mem.vcxproj", "{627F32A9-267F-41CA-827C-1FD04DE20A56}" ProjectSection(ProjectDependencies) = postProject {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}