]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
migrate t_resolver to lib/dns/tests/resolver_test
authorEvan Hunt <each@isc.org>
Wed, 28 Feb 2018 02:20:01 +0000 (18:20 -0800)
committerEvan Hunt <each@isc.org>
Fri, 9 Mar 2018 22:12:49 +0000 (14:12 -0800)
15 files changed:
bin/tests/.gitignore
bin/tests/Makefile.in
bin/tests/resolver/Makefile.in [deleted file]
bin/tests/resolver/t_resolver.c [deleted file]
bin/tests/resolver/win32/t_resolver.vcxproj.filters.in [deleted file]
bin/tests/resolver/win32/t_resolver.vcxproj.in [deleted file]
bin/tests/resolver/win32/t_resolver.vcxproj.user [deleted file]
configure
configure.in
lib/dns/tests/Atffile
lib/dns/tests/Makefile.in
lib/dns/tests/resolver_test.c [new file with mode: 0644]
util/copyrights
win32utils/Configure
win32utils/bind9.sln.in

index 81a0a73486fe6edaee0764778f93c92c53972030..3abcafac41680cc9fd881dbd95b75329a14ca30a 100644 (file)
@@ -9,7 +9,6 @@ gsstest
 t_dst
 t_names
 t_rbt
-t_resolver
 conf.sh
 dlopen
 keycreate
index 92757c7579da414ae7867bcc912b4b6f9240d19c..0a42079235024e4f6162fd15e5fd141de92cba77 100644 (file)
@@ -32,7 +32,7 @@ ISCCFGDEPLIBS = ../../lib/isccfg/libisccfg.@A@
 
 LIBS =         @LIBS@
 
-SUBDIR =       db dst names rbt resolver tasks system \
+SUBDIR =       db dst names rbt tasks system \
                @PKCS11_TOOLS@ optional
 
 TESTDIRS =     system
diff --git a/bin/tests/resolver/Makefile.in b/bin/tests/resolver/Makefile.in
deleted file mode 100644 (file)
index e29b0df..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# See the COPYRIGHT file distributed with this work for additional
-# information regarding copyright ownership.
-
-srcdir =       @srcdir@
-VPATH =                @srcdir@
-top_srcdir =   @top_srcdir@
-
-@BIND9_MAKE_INCLUDES@
-
-CINCLUDES =    ${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@ @ISC_OPENSSL_LIBS@
-
-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_resolver@EXEEXT@
-
-SRCS =         t_resolver.c
-
-@BIND9_MAKE_RULES@
-
-t_resolver@EXEEXT@: t_resolver.@O@ ${DEPLIBS} ${TLIB}
-       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ t_resolver.@O@ ${TLIB} ${LIBS}
-
-test: t_resolver@EXEEXT@
-       -@./t_resolver@EXEEXT@ -c @top_srcdir@/t_config -b @srcdir@ -a
-
-testhelp:
-       @./t_resolver@EXEEXT@ -h
-
-clean distclean::
-       rm -f ${TARGETS}
diff --git a/bin/tests/resolver/t_resolver.c b/bin/tests/resolver/t_resolver.c
deleted file mode 100644 (file)
index 738b720..0000000
+++ /dev/null
@@ -1,235 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-/* $Id: t_resolver.c,v 1.3 2011/02/03 12:18:11 tbox Exp $ */
-
-#include <config.h>
-
-#include <ctype.h>
-#include <stdlib.h>
-
-#include <isc/mem.h>
-#include <isc/util.h>
-#include <isc/string.h>
-#include <isc/timer.h>
-#include <isc/task.h>
-
-#include <dns/dispatch.h>
-#include <dns/resolver.h>
-#include <dns/result.h>
-#include <dns/view.h>
-
-#include <tests/t_api.h>
-
-char *progname;
-
-#define CHECK(x) RUNTIME_CHECK(ISC_R_SUCCESS == (x))
-
-
-isc_mem_t *mctx = NULL;
-isc_timermgr_t *timer_manager = NULL;
-isc_socketmgr_t *socket_manager = NULL;
-isc_taskmgr_t *task_manager = NULL;
-dns_dispatchmgr_t *dispatch_manager = NULL;
-dns_view_t *view = NULL;
-dns_dispatch_t *dispatch_v4 = NULL;
-
-static void
-setup_create_dispatch_v4(void)
-{
-       isc_sockaddr_t local_address;
-       isc_sockaddr_any(&local_address);
-
-       CHECK(dns_dispatch_getudp(dispatch_manager, socket_manager,
-                                 task_manager, &local_address,
-                                 4096, 100, 100, 100, 500, 0, 0,
-                                 &dispatch_v4));
-}
-static void
-setup(void) {
-       /* 1 */ CHECK(isc_mem_create(0, 0, &mctx));
-       /* 2 */ CHECK(isc_timermgr_create(mctx, &timer_manager));
-       /* 3 */ CHECK(isc_taskmgr_create(mctx, 1, 0, &task_manager));
-       /* 4 */ CHECK(isc_socketmgr_create(mctx, &socket_manager));
-       /* 5 */ CHECK(dns_dispatchmgr_create(mctx, NULL, &dispatch_manager));
-       /* 6 */ CHECK(dns_view_create(mctx, dns_rdataclass_in, "testview", &view));
-       /* 7 */ setup_create_dispatch_v4();
-}
-
-static void
-teardown(void) {
-       /* 7 */ dns_dispatch_detach(&dispatch_v4);
-       /* 6 */ dns_view_detach(&view);
-       /* 5 */ dns_dispatchmgr_destroy(&dispatch_manager);
-       /* 4 */ isc_socketmgr_destroy(&socket_manager);
-       /* 3 */ isc_taskmgr_destroy(&task_manager);
-       /* 2 */ isc_timermgr_destroy(&timer_manager);
-       /* 1 */ isc_mem_destroy(&mctx);
-}
-
-static isc_result_t
-make_resolver(dns_resolver_t **resolverp) {
-       isc_result_t result;
-
-       result = dns_resolver_create(view,
-                           task_manager, 1, 1,
-                           socket_manager,
-                           timer_manager,
-                           0, /* unsigned int options, */
-                           dispatch_manager,
-                           dispatch_v4,
-                           NULL, /* dns_dispatch_t *dispatchv6, */
-                           resolverp);
-
-       return (result);
-}
-
-static void
-destroy_resolver(dns_resolver_t **resolverp) {
-       dns_resolver_shutdown(*resolverp);
-       dns_resolver_detach(resolverp);
-}
-
-static void
-test_dns_resolver_create(void) {
-       dns_resolver_t *resolver = NULL;
-
-       t_assert("test_dns_resolver_create", 1, T_REQUIRED, "%s",
-                "a resolver can be created successfully");
-       setup();
-       CHECK(make_resolver(&resolver));
-
-       destroy_resolver(&resolver);
-       teardown();
-
-       t_result(T_PASS);
-}
-
-static void
-test_dns_resolver_gettimeout(void) {
-       dns_resolver_t *resolver = NULL;
-       int test_result;
-       unsigned int timeout;
-
-       t_assert("test_dns_resolver_gettimeout", 1, T_REQUIRED, "%s",
-                "The default timeout is returned from _gettimeout()");
-       setup();
-       CHECK(make_resolver(&resolver));
-
-       timeout = dns_resolver_gettimeout(resolver);
-       t_info("The default timeout is %d second%s\n", timeout, (timeout == 1 ? "" : "s"));
-       test_result = (timeout > 0) ? T_PASS : T_FAIL;
-
-       destroy_resolver(&resolver);
-       teardown();
-
-       t_result(test_result);
-}
-
-static void
-test_dns_resolver_settimeout(void) {
-       dns_resolver_t *resolver = NULL;
-       int test_result;
-       unsigned int default_timeout, timeout;
-
-       t_assert("test_dns_resolver_settimeout", 1, T_REQUIRED, "%s",
-                "_settimeout() can change the timeout to a non-default");
-       setup();
-       CHECK(make_resolver(&resolver));
-
-       default_timeout = dns_resolver_gettimeout(resolver);
-       t_info("The default timeout is %d second%s\n", default_timeout,
-              (default_timeout == 1 ? "" : "s"));
-
-       dns_resolver_settimeout(resolver, default_timeout + 1);
-       timeout = dns_resolver_gettimeout(resolver);
-       t_info("The new timeout is %d second%s\n", timeout,
-              (timeout == 1 ? "" : "s"));
-       test_result = (timeout == default_timeout + 1) ? T_PASS : T_FAIL;
-
-       destroy_resolver(&resolver);
-       teardown();
-
-       t_result(test_result);
-}
-
-static void
-test_dns_resolver_settimeout_to_default(void) {
-       dns_resolver_t *resolver = NULL;
-       int test_result;
-       unsigned int default_timeout, timeout;
-
-       t_assert("test_dns_resolver_settimeout_to_default", 1, T_REQUIRED, "%s",
-                "_settimeout() can change the timeout back to a default value"
-                " by specifying 0 as the timeout.");
-       setup();
-       CHECK(make_resolver(&resolver));
-
-       default_timeout = dns_resolver_gettimeout(resolver);
-       t_info("The default timeout is %d second%s\n", default_timeout,
-              (default_timeout == 1 ? "" : "s"));
-
-       dns_resolver_settimeout(resolver, default_timeout - 1);
-       timeout = dns_resolver_gettimeout(resolver);
-       t_info("The new timeout is %d second%s\n", timeout,
-              (timeout == 1 ? "" : "s"));
-
-       dns_resolver_settimeout(resolver, 0);
-       timeout = dns_resolver_gettimeout(resolver);
-       test_result = (timeout == default_timeout) ? T_PASS : T_FAIL;
-
-       destroy_resolver(&resolver);
-       teardown();
-
-       t_result(test_result);
-}
-
-static void
-test_dns_resolver_settimeout_over_maximum(void) {
-       dns_resolver_t *resolver = NULL;
-       int test_result;
-       unsigned int timeout;
-
-       t_assert("test_dns_resolver_settimeout_over_maximum", 1, T_REQUIRED, "%s",
-                "_settimeout() cannot set the value larger than the maximum.");
-       setup();
-       CHECK(make_resolver(&resolver));
-
-       dns_resolver_settimeout(resolver, 4000000);
-       timeout = dns_resolver_gettimeout(resolver);
-       t_info("The new timeout is %d second%s\n", timeout,
-              (timeout == 1 ? "" : "s"));
-
-       test_result = (timeout < 4000000 && timeout > 0) ? T_PASS : T_FAIL;
-
-       destroy_resolver(&resolver);
-       teardown();
-
-       t_result(test_result);
-}
-
-
-testspec_t T_testlist[] = {
-       { (PFV) test_dns_resolver_create,       "dns_resolver_create"           },
-       { (PFV) test_dns_resolver_settimeout,   "dns_resolver_settimeout"       },
-       { (PFV) test_dns_resolver_gettimeout,   "dns_resolver_gettimeout"       },
-       { (PFV) test_dns_resolver_settimeout_to_default, "test_dns_resolver_settimeout_to_default" },
-       { (PFV) test_dns_resolver_settimeout_over_maximum, "test_dns_resolver_settimeout_over_maximum" },
-       { (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/resolver/win32/t_resolver.vcxproj.filters.in b/bin/tests/resolver/win32/t_resolver.vcxproj.filters.in
deleted file mode 100644 (file)
index 01714b9..0000000
+++ /dev/null
@@ -1,22 +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>
-    <ClCompile Include="..\t_resolver.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/bin/tests/resolver/win32/t_resolver.vcxproj.in b/bin/tests/resolver/win32/t_resolver.vcxproj.in
deleted file mode 100644 (file)
index 756da60..0000000
+++ /dev/null
@@ -1,110 +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>{66E58849-A764-44E4-8D32-7C1107246A26}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>t_resolver</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|@PLATFORM@'" Label="Configuration">
-    <ConfigurationType>Application</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;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeaderOutputFile>.\$(Configuration)\$(TargetName).pch</PrecompiledHeaderOutputFile>
-      <AssemblerListingLocation>.\$(Configuration)\</AssemblerListingLocation>
-      <ObjectFileName>.\$(Configuration)\</ObjectFileName>
-      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <BrowseInformation>true</BrowseInformation>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@GEOIP_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </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;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <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>
-      <AdditionalIncludeDirectories>.\;..\..\..\..\;@LIBXML2_INC@@OPENSSL_INC@@GEOIP_INC@..\..\..\..\lib\isc\win32;..\..\..\..\lib\isc\win32\include;..\..\..\..\lib\isc\include;..\..\..\..\lib\dns\include;..\..\..\..\lib\tests\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <OutputFile>..\..\..\..\Build\$(Configuration)\$(TargetName)$(TargetExt)</OutputFile>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-      <AdditionalLibraryDirectories>..\..\..\..\lib\isc\win32\$(Configuration);..\..\..\..\lib\dns\win32\$(Configuration);..\..\..\..\lib\tests\win32\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>@LIBXML2_LIB@libisc.lib;libdns.lib;libtests.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\t_resolver.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
diff --git a/bin/tests/resolver/win32/t_resolver.vcxproj.user b/bin/tests/resolver/win32/t_resolver.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 cd299e8bc722202ffdfeb4cebca16a3925ea0c40..4220b8ab39473e02ff7aa5e6d7707c66fcd0e2f7 100755 (executable)
--- a/configure
+++ b/configure
@@ -24157,7 +24157,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/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/headerdep_test.sh bin/tests/names/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/Makefile bin/tests/resolver/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/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/tasks/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/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/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/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/headerdep_test.sh bin/tests/names/Makefile bin/tests/optional/Makefile bin/tests/pkcs11/Makefile bin/tests/pkcs11/benchmarks/Makefile bin/tests/rbt/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/pipelined/Makefile bin/tests/system/rndc/Makefile bin/tests/system/rpz/Makefile bin/tests/system/rsabigexponent/Makefile bin/tests/system/tkey/Makefile bin/tests/tasks/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/ns/Makefile lib/ns/include/Makefile lib/ns/include/ns/Makefile lib/ns/tests/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"
 
 
 #
@@ -25219,7 +25219,6 @@ do
     "bin/tests/pkcs11/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/pkcs11/Makefile" ;;
     "bin/tests/pkcs11/benchmarks/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/pkcs11/benchmarks/Makefile" ;;
     "bin/tests/rbt/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/rbt/Makefile" ;;
-    "bin/tests/resolver/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/resolver/Makefile" ;;
     "bin/tests/system/Makefile") CONFIG_FILES="$CONFIG_FILES bin/tests/system/Makefile" ;;
     "bin/tests/system/conf.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/conf.sh" ;;
     "bin/tests/system/dlz/prereq.sh") CONFIG_FILES="$CONFIG_FILES bin/tests/system/dlz/prereq.sh" ;;
index 860933e5f7e09bb326d7c108a56f2763f35fbc1b..573e0763078010e94600c2538dc92025ea68144c 100644 (file)
@@ -5336,7 +5336,6 @@ AC_CONFIG_FILES([
        bin/tests/pkcs11/Makefile
        bin/tests/pkcs11/benchmarks/Makefile
        bin/tests/rbt/Makefile
-       bin/tests/resolver/Makefile
        bin/tests/system/Makefile
        bin/tests/system/conf.sh
        bin/tests/system/dlz/prereq.sh
index 58d0515630463f59f4f24731c9fa846191b03462..f83af900512d13108408f31b3100f55095c34442 100644 (file)
@@ -24,6 +24,7 @@ tp: rbt_test
 tp: rdata_test
 tp: rdataset_test
 tp: rdatasetstats_test
+tp: resolver_test
 tp: rsa_test
 tp: time_test
 tp: tsig_test
index 955c0b241829c5f466fad24d21149513c5628348..38118d9698cf69bd4f1133abf188b3c4358ecea2 100644 (file)
@@ -53,6 +53,7 @@ SRCS =                acl_test.c \
                rdata_test.c \
                rdataset_test.c \
                rdatasetstats_test.c \
+               resolver_test.c \
                rsa_test.c \
                time_test.c \
                tsig_test.c \
@@ -83,6 +84,7 @@ TARGETS =     acl_test@EXEEXT@ \
                rdata_test@EXEEXT@ \
                rdataset_test@EXEEXT@ \
                rdatasetstats_test@EXEEXT@ \
+               resolver_test@EXEEXT@ \
                rsa_test@EXEEXT@ \
                time_test@EXEEXT@ \
                tsig_test@EXEEXT@ \
@@ -205,6 +207,12 @@ rdatasetstats_test@EXEEXT@: rdatasetstats_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${D
                        rdatasetstats_test.@O@ dnstest.@O@ ${DNSLIBS} \
                                ${ISCLIBS} ${LIBS}
 
+resolver_test@EXEEXT@: resolver_test.@O@ dnstest.@O@ \
+               ${ISCDEPLIBS} ${DNSDEPLIBS}
+       ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
+                       resolver_test.@O@ dnstest.@O@ ${DNSLIBS} \
+                               ${ISCLIBS} ${LIBS}
+
 rsa_test@EXEEXT@: rsa_test.@O@ dnstest.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
        ${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
                        rsa_test.@O@ dnstest.@O@ ${DNSLIBS} \
diff --git a/lib/dns/tests/resolver_test.c b/lib/dns/tests/resolver_test.c
new file mode 100644 (file)
index 0000000..1bb34f2
--- /dev/null
@@ -0,0 +1,228 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+/*! \file */
+
+#include <config.h>
+
+#include <atf-c.h>
+
+#include <unistd.h>
+
+#include <isc/app.h>
+#include <isc/buffer.h>
+#include <isc/socket.h>
+#include <isc/task.h>
+#include <isc/timer.h>
+
+#include <dns/dispatch.h>
+#include <dns/name.h>
+#include <dns/resolver.h>
+#include <dns/view.h>
+
+#include "dnstest.h"
+
+static dns_dispatchmgr_t *dispatchmgr = NULL;
+static dns_dispatch_t *dispatch = NULL;
+static dns_view_t *view = NULL;
+
+
+static void
+setup(void) {
+       isc_result_t result;
+       isc_sockaddr_t local;
+
+       result = dns_test_begin(NULL, ISC_TRUE);
+       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+
+       result = dns_dispatchmgr_create(mctx, NULL, &dispatchmgr);
+       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+
+       result = dns_test_makeview("view", &view);
+       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+
+       isc_sockaddr_any(&local);
+       result = dns_dispatch_getudp(dispatchmgr, socketmgr, taskmgr, &local,
+                                    4096, 100, 100, 100, 500, 0, 0,
+                                    &dispatch);
+       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+}
+
+static void
+teardown(void) {
+       dns_dispatch_detach(&dispatch);
+       dns_view_detach(&view);
+       dns_dispatchmgr_destroy(&dispatchmgr);
+       dns_test_end();
+}
+
+
+static void
+mkres(dns_resolver_t **resolverp) {
+       isc_result_t result;
+
+       result = dns_resolver_create(view, taskmgr, 1, 1,
+                           socketmgr, timermgr, 0,
+                           dispatchmgr, dispatch, NULL, resolverp);
+       ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
+}
+
+static void
+destroy_resolver(dns_resolver_t **resolverp) {
+       dns_resolver_shutdown(*resolverp);
+       dns_resolver_detach(resolverp);
+}
+
+ATF_TC(create);
+ATF_TC_HEAD(create, tc) {
+       atf_tc_set_md_var(tc, "descr", "dns_resolver_create");
+}
+ATF_TC_BODY(create, tc) {
+       dns_resolver_t *resolver = NULL;
+
+       UNUSED(tc);
+
+       setup();
+       mkres(&resolver);
+       destroy_resolver(&resolver);
+       teardown();
+}
+
+ATF_TC(gettimeout);
+ATF_TC_HEAD(gettimeout, tc) {
+       atf_tc_set_md_var(tc, "descr", "dns_resolver_gettimeout");
+}
+ATF_TC_BODY(gettimeout, tc) {
+       dns_resolver_t *resolver = NULL;
+       unsigned int timeout;
+
+       UNUSED(tc);
+
+       setup();
+       mkres(&resolver);
+
+       timeout = dns_resolver_gettimeout(resolver);
+       ATF_CHECK(timeout > 0);
+
+       destroy_resolver(&resolver);
+       teardown();
+}
+
+ATF_TC(settimeout);
+ATF_TC_HEAD(settimeout, tc) {
+       atf_tc_set_md_var(tc, "descr", "dns_resolver_settimeout");
+}
+ATF_TC_BODY(settimeout, tc) {
+       dns_resolver_t *resolver = NULL;
+       unsigned int default_timeout, timeout;
+
+       UNUSED(tc);
+
+       setup();
+
+       mkres(&resolver);
+
+       default_timeout = dns_resolver_gettimeout(resolver);
+       dns_resolver_settimeout(resolver, default_timeout + 1);
+       timeout = dns_resolver_gettimeout(resolver);
+       ATF_CHECK(timeout == default_timeout + 1);
+
+       destroy_resolver(&resolver);
+       teardown();
+}
+
+ATF_TC(settimeout_default);
+ATF_TC_HEAD(settimeout_default, tc) {
+       atf_tc_set_md_var(tc, "descr", "dns_resolver_settimeout to default");
+}
+ATF_TC_BODY(settimeout_default, tc) {
+       dns_resolver_t *resolver = NULL;
+       unsigned int default_timeout, timeout;
+
+       UNUSED(tc);
+
+       setup();
+
+       mkres(&resolver);
+
+       default_timeout = dns_resolver_gettimeout(resolver);
+       dns_resolver_settimeout(resolver, default_timeout + 100);
+
+       timeout = dns_resolver_gettimeout(resolver);
+       ATF_CHECK_EQ(timeout, default_timeout + 100);
+
+       dns_resolver_settimeout(resolver, 0);
+       timeout = dns_resolver_gettimeout(resolver);
+       ATF_CHECK_EQ(timeout, default_timeout);
+
+       destroy_resolver(&resolver);
+       teardown();
+}
+
+ATF_TC(settimeout_belowmin);
+ATF_TC_HEAD(settimeout_belowmin, tc) {
+       atf_tc_set_md_var(tc, "descr",
+                         "dns_resolver_settimeout below minimum");
+}
+ATF_TC_BODY(settimeout_belowmin, tc) {
+       dns_resolver_t *resolver = NULL;
+       unsigned int default_timeout, timeout;
+
+       UNUSED(tc);
+
+       setup();
+
+       mkres(&resolver);
+
+       default_timeout = dns_resolver_gettimeout(resolver);
+       dns_resolver_settimeout(resolver, 9000);
+
+       timeout = dns_resolver_gettimeout(resolver);
+       ATF_CHECK_EQ(timeout, default_timeout);
+
+       destroy_resolver(&resolver);
+       teardown();
+}
+
+ATF_TC(settimeout_overmax);
+ATF_TC_HEAD(settimeout_overmax, tc) {
+       atf_tc_set_md_var(tc, "descr", "dns_resolver_settimeout over maximum");
+}
+ATF_TC_BODY(settimeout_overmax, tc) {
+       dns_resolver_t *resolver = NULL;
+       unsigned int timeout;
+
+       UNUSED(tc);
+
+       setup();
+
+       mkres(&resolver);
+
+       dns_resolver_settimeout(resolver, 4000000);
+       timeout = dns_resolver_gettimeout(resolver);
+       ATF_CHECK(timeout < 4000000 && timeout > 0);
+
+       destroy_resolver(&resolver);
+       teardown();
+}
+
+/*
+ * Main
+ */
+ATF_TP_ADD_TCS(tp) {
+       ATF_TP_ADD_TC(tp, create);
+       ATF_TP_ADD_TC(tp, gettimeout);
+       ATF_TP_ADD_TC(tp, settimeout);
+       ATF_TP_ADD_TC(tp, settimeout_default);
+       ATF_TP_ADD_TC(tp, settimeout_belowmin);
+       ATF_TP_ADD_TC(tp, settimeout_overmax);
+       return (atf_no_error());
+}
index 78a1b069cd69eb979c5b63bcabdce904466e2dc5..0d62f580c8aa3eb246bcdc9862e03175f5660cc2 100644 (file)
 ./bin/tests/rbt_test.c                         C       1999,2000,2001,2004,2005,2007,2009,2011,2012,2014,2015,2016,2018
 ./bin/tests/rbt_test.out                       X       1999,2000,2001,2018
 ./bin/tests/rbt_test.txt                       SH      1999,2000,2001,2004,2007,2012,2016,2018
-./bin/tests/resolver/Makefile.in               MAKE    2011,2012,2014,2016,2017,2018
-./bin/tests/resolver/t_resolver.c              C       2011,2012,2013,2014,2016,2018
-./bin/tests/resolver/win32/t_resolver.vcxproj.filters.in       X       2013,2015,2018
-./bin/tests/resolver/win32/t_resolver.vcxproj.in       X       2013,2015,2016,2017,2018
-./bin/tests/resolver/win32/t_resolver.vcxproj.user     X       2013,2018
 ./bin/tests/rwlock_test.c                      C       1998,1999,2000,2001,2004,2005,2007,2013,2016,2017,2018
 ./bin/tests/serial_test.c                      C       1999,2000,2001,2003,2004,2007,2015,2016,2018
 ./bin/tests/shutdown_test.c                    C       1998,1999,2000,2001,2004,2007,2011,2013,2016,2017,2018
index 8ae8d289403b8940c0190f2aabb2b5ea3388a0b5..30cc692b696ce0bbc86d9a875c0e015b2c371594 100644 (file)
@@ -124,8 +124,6 @@ my @projectlist = ("..\\bin\\check\\win32\\checkconf.vcxproj",
                    "..\\bin\\tests\\names\\win32\\t_names.vcxproj.filters",
                    "..\\bin\\tests\\rbt\\win32\\t_rbt.vcxproj",
                    "..\\bin\\tests\\rbt\\win32\\t_rbt.vcxproj.filters",
-                   "..\\bin\\tests\\resolver\\win32\\t_resolver.vcxproj",
-                   "..\\bin\\tests\\resolver\\win32\\t_resolver.vcxproj.filters",
                    "..\\bin\\tests\\system\\win32\\bigkey.vcxproj",
                    "..\\bin\\tests\\system\\win32\\bigkey.vcxproj.filters",
                    "..\\bin\\tests\\system\\win32\\feature-test.vcxproj",
index 09adb1f7d17e5cf883fdeaf31b6a7320b5645aa0..f41e95ee6b5b134d922cfdec10fef066366ca0f6 100644 (file)
@@ -532,14 +532,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_rbt", "..\bin\tests\rbt\w
                {F6F08940-7597-4FEE-9CE0-E09A009C45A3} = {F6F08940-7597-4FEE-9CE0-E09A009C45A3}
        EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "t_resolver", "..\bin\tests\resolver\win32\t_resolver.vcxproj", "{66E58849-A764-44E4-8D32-7C1107246A26}"
-       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_tasks", "..\bin\tests\tasks\win32\t_tasks.vcxproj", "{2CB7B128-5954-4FAF-B5EA-501B23BB8054}"
        ProjectSection(ProjectDependencies) = postProject
                {3840E563-D180-4761-AA9C-E6155F02EAFF} = {3840E563-D180-4761-AA9C-E6155F02EAFF}