BIND 10 trac2117, updated. 007839e627b153351406e9ad8d11cdc7324b005c add check xfr and badpacket
BIND 10 source code commits
bind10-changes at lists.isc.org
Sun Sep 2 22:52:35 UTC 2012
The branch, trac2117 has been updated
via 007839e627b153351406e9ad8d11cdc7324b005c (commit)
from 10fe946b737a697b90acea6c9387acf16f039921 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 007839e627b153351406e9ad8d11cdc7324b005c
Author: Francis Dupont <fdupont at isc.org>
Date: Mon Sep 3 00:40:57 2012 +0200
add check xfr and badpacket
-----------------------------------------------------------------------
Summary of changes:
src/bin/bind10/run_bind10.sh.win32 | 2 +-
src/bin/bindctl/run_bindctl.sh.win32 | 2 +-
src/bin/cmdctl/run_b10-cmdctl.sh.win32 | 2 +-
src/bin/msgq/run_msgq.sh.win32 | 3 +-
src/bin/usermgr/run_b10-cmdctl-usermgr.sh.win32 | 5 +++-
src/bin/xfrin/run_b10-xfrin.sh.win32 | 3 +-
src/bin/xfrout/run_b10-xfrout.sh.win32 | 3 +-
src/bin/zonemgr/run_b10-zonemgr.sh.win32 | 3 +-
src/lib/xfr/tests/NO_PORT_ON_WINDOWS | 1 -
src/lib/xfr/tests/client_test.cc | 19 ++++++++++++-
src/lib/xfr/xfrout_client.cc | 4 +++
win32build/VS2010/acl-tests/acl-tests.vcxproj | 6 ++--
win32build/VS2010/b10-host/b10-host.vcxproj | 18 ++++++++++--
.../VS2010/badpacket-tests/badpacket-tests.vcxproj | 4 +--
win32build/VS2010/bind10.sln | 12 ++++++++
.../VS2010/datasrc-ftests/datasrc-ftests.vcxproj | 4 +--
.../VS2010/log-i1utests/log-i1utests.vcxproj | 6 ++--
.../VS2010/log-i2utests/log-i2utests.vcxproj | 6 ++--
win32build/VS2010/log-lltest/log-lltest.vcxproj | 6 ++--
win32build/VS2010/log-tests/log-tests.vcxproj | 4 +--
.../VS2010/resolve-tests/resolve-tests.vcxproj | 4 +--
.../VS2010/resolver-tests/resolver-tests.vcxproj | 4 +--
.../xfr-tests.vcxproj} | 22 +++++++--------
.../xfr-tests.vcxproj.filters} | 4 +--
.../xfr-tests.vcxproj.user} | 0
win32build/check/all.sh | 5 +++-
win32build/check/badpacket-all.sh | 2 ++
win32build/check/badpacket-debug.sh | 5 ++++
win32build/check/badpacket-release.sh | 5 ++++
win32build/check/debug-all.sh | 5 +++-
win32build/check/release-all.sh | 5 +++-
win32build/check/stats-all.sh | 2 ++
win32build/check/stats-debug.sh | 29 ++++++++++++++++++++
win32build/check/stats-release.sh | 29 ++++++++++++++++++++
win32build/check/xfr-all.sh | 2 ++
win32build/check/xfr-debug.sh | 5 ++++
win32build/check/xfr-release.sh | 5 ++++
37 files changed, 192 insertions(+), 54 deletions(-)
delete mode 100644 src/lib/xfr/tests/NO_PORT_ON_WINDOWS
copy win32build/VS2010/{cryptolink-tests/cryptolink-tests.vcxproj => xfr-tests/xfr-tests.vcxproj} (78%)
copy win32build/VS2010/{datasrc-ftests/datasrc-ftests.vcxproj.filters => xfr-tests/xfr-tests.vcxproj.filters} (83%)
copy win32build/VS2010/{BINDInstall/BINDInstall.vcxproj.user => xfr-tests/xfr-tests.vcxproj.user} (100%)
create mode 100755 win32build/check/badpacket-all.sh
create mode 100755 win32build/check/badpacket-debug.sh
create mode 100755 win32build/check/badpacket-release.sh
create mode 100755 win32build/check/stats-all.sh
create mode 100755 win32build/check/stats-debug.sh
create mode 100755 win32build/check/stats-release.sh
create mode 100755 win32build/check/xfr-all.sh
create mode 100755 win32build/check/xfr-debug.sh
create mode 100755 win32build/check/xfr-release.sh
-----------------------------------------------------------------------
diff --git a/src/bin/bind10/run_bind10.sh.win32 b/src/bin/bind10/run_bind10.sh.win32
index a113536..ecb0ef1 100755
--- a/src/bin/bind10/run_bind10.sh.win32
+++ b/src/bin/bind10/run_bind10.sh.win32
@@ -51,5 +51,5 @@ export B10_FROM_BUILD
BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
export BIND10_MSGQ_SOCKET_FILE
-exec ${PYTHON} -O ${BIND10_PATH}/bind10.py "$@"
+exec ${PYTHON} -O ${BIND10_PATH}/bind10_src.py "$@"
diff --git a/src/bin/bindctl/run_bindctl.sh.win32 b/src/bin/bindctl/run_bindctl.sh.win32
index 56c3d7d..aaaca92 100755
--- a/src/bin/bindctl/run_bindctl.sh.win32
+++ b/src/bin/bindctl/run_bindctl.sh.win32
@@ -31,4 +31,4 @@ BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
export BIND10_MSGQ_SOCKET_FILE
cd ${BINDCTL_PATH}
-exec ${PYTHON} -O bindctl.py "$@"
+exec ${PYTHON} -O bindctl_main.py "$@"
diff --git a/src/bin/cmdctl/run_b10-cmdctl.sh.win32 b/src/bin/cmdctl/run_b10-cmdctl.sh.win32
index f82d5a7..df95118 100755
--- a/src/bin/cmdctl/run_b10-cmdctl.sh.win32
+++ b/src/bin/cmdctl/run_b10-cmdctl.sh.win32
@@ -27,4 +27,4 @@ BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
export BIND10_MSGQ_SOCKET_FILE
cd ${CMD_CTRLD_PATH}
-exec ${PYTHON} b10-cmdctl "$@"
+exec ${PYTHON} cmdctl.py "$@"
diff --git a/src/bin/msgq/run_msgq.sh.win32 b/src/bin/msgq/run_msgq.sh.win32
index 4150414..3e58754 100755
--- a/src/bin/msgq/run_msgq.sh.win32
+++ b/src/bin/msgq/run_msgq.sh.win32
@@ -19,6 +19,7 @@
MYPATH_PATH=${BIND10HOME}/src/bin/msgq
+PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python"
export PYTHONPATH
@@ -26,4 +27,4 @@ BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
export BIND10_MSGQ_SOCKET_FILE
cd ${MYPATH_PATH}
-exec ${PYTHON} -O b10-msgq.py "$@"
+exec ${PYTHON} -O msgq.py "$@"
diff --git a/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.win32 b/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.win32
index 3b67e3d..af061e9 100755
--- a/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.win32
+++ b/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.win32
@@ -18,9 +18,12 @@
. ${BIND10HOME}/win32build/env-${VSCNF:-release}.sh
MYPATH_PATH=${BIND10HOME}/src/bin/usermgr
+PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
+PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python"
+export PYTHONPATH
BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
export BIND10_MSGQ_SOCKET_FILE
cd ${MYPATH_PATH}
-exec ${PYTHON} b10-cmdctl-usermgr "$@"
+exec ${PYTHON} b10-cmdctl-usermgr.py "$@"
diff --git a/src/bin/xfrin/run_b10-xfrin.sh.win32 b/src/bin/xfrin/run_b10-xfrin.sh.win32
index d41d0a9..099e6db 100755
--- a/src/bin/xfrin/run_b10-xfrin.sh.win32
+++ b/src/bin/xfrin/run_b10-xfrin.sh.win32
@@ -18,6 +18,7 @@
. ${BIND10HOME}/win32build/env-${VSCNF:-release}.sh
MYPATH_PATH=${BIND10HOME}/src/bin/xfrin
+PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python"
export PYTHONPATH
@@ -25,4 +26,4 @@ BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
export BIND10_MSGQ_SOCKET_FILE
cd ${MYPATH_PATH}
-exec ${PYTHON} b10-xfrin "$@"
+exec ${PYTHON} xfrin.py "$@"
diff --git a/src/bin/xfrout/run_b10-xfrout.sh.win32 b/src/bin/xfrout/run_b10-xfrout.sh.win32
index 2b8aafc..12325b4 100755
--- a/src/bin/xfrout/run_b10-xfrout.sh.win32
+++ b/src/bin/xfrout/run_b10-xfrout.sh.win32
@@ -18,6 +18,7 @@
. ${BIND10HOME}/win32build/env-${VSCNF:-release}.sh
MYPATH_PATH=${BIND10HOME}/src/bin/xfrout
+PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python"
export PYTHONPATH
@@ -25,4 +26,4 @@ BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
export BIND10_MSGQ_SOCKET_FILE
cd ${MYPATH_PATH}
-exec ${PYTHON} b10-xfrout "$@"
+exec ${PYTHON} xfrout.py "$@"
diff --git a/src/bin/zonemgr/run_b10-zonemgr.sh.win32 b/src/bin/zonemgr/run_b10-zonemgr.sh.win32
index 29541b1..dc69b9c 100755
--- a/src/bin/zonemgr/run_b10-zonemgr.sh.win32
+++ b/src/bin/zonemgr/run_b10-zonemgr.sh.win32
@@ -18,6 +18,7 @@
. ${BIND10HOME}/win32build/env-${VSCNF:-release}.sh
MYPATH_PATH=${BIND10HOME}/src/bin/zonemgr
+PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python"
export PYTHONPATH
@@ -25,4 +26,4 @@ BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
export BIND10_MSGQ_SOCKET_FILE
cd ${MYPATH_PATH}
-exec ${PYTHON} b10-zonemgr "$@"
+exec ${PYTHON} zonemgr.py "$@"
diff --git a/src/lib/xfr/tests/NO_PORT_ON_WINDOWS b/src/lib/xfr/tests/NO_PORT_ON_WINDOWS
deleted file mode 100644
index 490a587..0000000
--- a/src/lib/xfr/tests/NO_PORT_ON_WINDOWS
+++ /dev/null
@@ -1 +0,0 @@
-idea: connect to multicast in TCP -> error
diff --git a/src/lib/xfr/tests/client_test.cc b/src/lib/xfr/tests/client_test.cc
index 6c9f4ad..6284d5b 100644
--- a/src/lib/xfr/tests/client_test.cc
+++ b/src/lib/xfr/tests/client_test.cc
@@ -14,7 +14,11 @@
#include <gtest/gtest.h>
+#ifdef _WIN32
+#include <ws2tcpip.h>
+#else
#include <sys/un.h>
+#endif
#include <string>
#include <xfr/xfrout_client.h>
@@ -24,7 +28,8 @@ using namespace isc::xfr;
namespace {
-TEST(ClientTest, connetFile) {
+#ifndef _WIN32
+TEST(ClientTest, connectFile) {
// File path is too long
struct sockaddr_un s; // can't be const; some compiler complains
EXPECT_THROW(XfroutClient(string(sizeof(s.sun_path), 'x')).connect(),
@@ -33,5 +38,17 @@ TEST(ClientTest, connetFile) {
// File doesn't exist (we assume the file "no_such_file" doesn't exist)
EXPECT_THROW(XfroutClient("no_such_file").connect(), XfroutError);
}
+#else
+TEST(ClientTest, connect) {
+ // Invalid spec
+ EXPECT_THROW(XfroutClient("invalid_spec").connect(), XfroutError);
+
+ // Invalid port
+ EXPECT_THROW(XfroutClient("v4_99999").connect(), XfroutError);
+
+ // Port doesn't exist (we assume the port 100 doesn't exist)
+ EXPECT_THROW(XfroutClient("v6_100").connect(), XfroutError);
+}
+#endif
}
diff --git a/src/lib/xfr/xfrout_client.cc b/src/lib/xfr/xfrout_client.cc
index b7a54e3..cc9ca4b 100644
--- a/src/lib/xfr/xfrout_client.cc
+++ b/src/lib/xfr/xfrout_client.cc
@@ -79,6 +79,10 @@ XfroutClient::connect() {
stream_protocol::endpoint ep(addr, port);
#endif
impl_->socket_.connect(ep);
+#ifdef _WIN32
+ } catch (const boost::bad_lexical_cast&) {
+ isc_throw(XfroutError, "bad port in endpoint: " << impl_->file_path_);
+#endif
} catch (const asio::system_error& err) {
isc_throw(XfroutError, "socket connect failed for " <<
impl_->file_path_ << ": " << err.what());
diff --git a/win32build/VS2010/acl-tests/acl-tests.vcxproj b/win32build/VS2010/acl-tests/acl-tests.vcxproj
index bfa2191..fdcbb86 100755
--- a/win32build/VS2010/acl-tests/acl-tests.vcxproj
+++ b/win32build/VS2010/acl-tests/acl-tests.vcxproj
@@ -49,8 +49,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -67,8 +66,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
diff --git a/win32build/VS2010/b10-host/b10-host.vcxproj b/win32build/VS2010/b10-host/b10-host.vcxproj
index 6a9db26..ec07b66 100755
--- a/win32build/VS2010/b10-host/b10-host.vcxproj
+++ b/win32build/VS2010/b10-host/b10-host.vcxproj
@@ -91,7 +91,14 @@ copy xfrout\run_b10-xfrout.sh.win32 xfrout\run_b10-xfrout.sh
copy xfrout\xfrout.py.win32 xfrout\xfrout.py
copy xfrout\tests\xfrout_test.py.win32 xfrout\tests\xfrout_test.py
copy xfrout\tests\xfrout_test.win32 xfrout\tests\xfrout_test.sh
-
+copy usermgr\b10-cmdctl-usermgr.py.win32 usermgr\b10-cmdctl-usermgr.py
+copy usermgr\run_b10-cmdctl-usermgr.sh.win32 usermgr\run_b10-cmdctl-usermgr.sh
+copy zonemgr\run_b10-zonemgr.sh.win32 zonemgr\run_b10-zonemgr.sh
+copy zonemgr\zonemgr.py.win32 zonemgr\zonemgr.py
+copy zonemgr\tests\zonemgr_test.win32 zonemgr\tests\zonemgr_test.sh
+copy stats\stats.py.win32 stats\stats.py
+copy stats\stats_httpd.py.win32 stats\stats_httpd.py
+copy tests\process_rename_test.py.win32 tests\process_rename_test.py
copy dbutil\dbutil.py.win32 dbutil\dbutil.py
copy dbutil\run_dbutil.sh.win32 dbutil\run_dbutil.sh
copy dbutil\tests\dbutil_test.sh.win32 dbutil\tests\dbutil_test.sh
@@ -166,7 +173,14 @@ copy xfrout\run_b10-xfrout.sh.win32 xfrout\run_b10-xfrout.sh
copy xfrout\xfrout.py.win32 xfrout\xfrout.py
copy xfrout\tests\xfrout_test.py.win32 xfrout\tests\xfrout_test.py
copy xfrout\tests\xfrout_test.win32 xfrout\tests\xfrout_test.sh
-
+copy usermgr\b10-cmdctl-usermgr.py.win32 usermgr\b10-cmdctl-usermgr.py
+copy usermgr\run_b10-cmdctl-usermgr.sh.win32 usermgr\run_b10-cmdctl-usermgr.sh
+copy zonemgr\run_b10-zonemgr.sh.win32 zonemgr\run_b10-zonemgr.sh
+copy zonemgr\zonemgr.py.win32 zonemgr\zonemgr.py
+copy zonemgr\tests\zonemgr_test.win32 zonemgr\tests\zonemgr_test.sh
+copy stats\stats.py.win32 stats\stats.py
+copy stats\stats_httpd.py.win32 stats\stats_httpd.py
+copy tests\process_rename_test.py.win32 tests\process_rename_test.py
copy dbutil\dbutil.py.win32 dbutil\dbutil.py
copy dbutil\run_dbutil.sh.win32 dbutil\run_dbutil.sh
copy dbutil\tests\dbutil_test.sh.win32 dbutil\tests\dbutil_test.sh
diff --git a/win32build/VS2010/badpacket-tests/badpacket-tests.vcxproj b/win32build/VS2010/badpacket-tests/badpacket-tests.vcxproj
index 46c6e83..548e728 100755
--- a/win32build/VS2010/badpacket-tests/badpacket-tests.vcxproj
+++ b/win32build/VS2010/badpacket-tests/badpacket-tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -71,7 +71,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/bind10.sln b/win32build/VS2010/bind10.sln
index 8869b82..36c65b2 100755
--- a/win32build/VS2010/bind10.sln
+++ b/win32build/VS2010/bind10.sln
@@ -46,6 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\
{D85833AC-23A9-4710-9911-8AAEC4BF6E8F} = {D85833AC-23A9-4710-9911-8AAEC4BF6E8F}
{1CCFABAC-5A0B-499F-914E-AAD0371EEC4F} = {1CCFABAC-5A0B-499F-914E-AAD0371EEC4F}
{B5D971AD-D95B-4A15-9E31-38AEF4F69627} = {B5D971AD-D95B-4A15-9E31-38AEF4F69627}
+ {1F5C82AD-0BE1-48A7-A3E8-F03637B43B9A} = {1F5C82AD-0BE1-48A7-A3E8-F03637B43B9A}
{B681A9B5-8BA0-4553-B3EC-F94DC4986CA3} = {B681A9B5-8BA0-4553-B3EC-F94DC4986CA3}
{EB54F7B8-FAEF-4348-989C-D4E6B42CEFB1} = {EB54F7B8-FAEF-4348-989C-D4E6B42CEFB1}
{13D541BC-8365-42F7-840F-A117CA0413DD} = {13D541BC-8365-42F7-840F-A117CA0413DD}
@@ -719,6 +720,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libunittest_util", "libunit
{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xfr-tests", "xfr-tests\xfr-tests.vcxproj", "{1F5C82AD-0BE1-48A7-A3E8-F03637B43B9A}"
+ ProjectSection(ProjectDependencies) = postProject
+ {761E7D88-6CCB-4E41-9F1E-6C1FBBD062F5} = {761E7D88-6CCB-4E41-9F1E-6C1FBBD062F5}
+ {357140E6-91CE-404C-BC96-D8AE23512B67} = {357140E6-91CE-404C-BC96-D8AE23512B67}
+ {AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1013,6 +1021,10 @@ Global
{357140E6-91CE-404C-BC96-D8AE23512B67}.Debug|Win32.Build.0 = Debug|Win32
{357140E6-91CE-404C-BC96-D8AE23512B67}.Release|Win32.ActiveCfg = Release|Win32
{357140E6-91CE-404C-BC96-D8AE23512B67}.Release|Win32.Build.0 = Release|Win32
+ {1F5C82AD-0BE1-48A7-A3E8-F03637B43B9A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {1F5C82AD-0BE1-48A7-A3E8-F03637B43B9A}.Debug|Win32.Build.0 = Debug|Win32
+ {1F5C82AD-0BE1-48A7-A3E8-F03637B43B9A}.Release|Win32.ActiveCfg = Release|Win32
+ {1F5C82AD-0BE1-48A7-A3E8-F03637B43B9A}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj b/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj
index b1764bd..0549f40 100755
--- a/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj
+++ b/win32build/VS2010/datasrc-ftests/datasrc-ftests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";PKGLIBDIR="%BIND10HOME%/win32build/VS2010/$(Configuration)/";_DEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";PKGLIBDIR="%BIND10HOME%/win32build/VS2010/$(Configuration)/";_DEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -70,7 +70,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";PKGLIBDIR="%BIND10HOME%/win32build/VS2010/$(Configuration)/";NDEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";PKGLIBDIR="%BIND10HOME%/win32build/VS2010/$(Configuration)/";NDEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/log-i1utests/log-i1utests.vcxproj b/win32build/VS2010/log-i1utests/log-i1utests.vcxproj
index 7576cbc..30e0ee9 100755
--- a/win32build/VS2010/log-i1utests/log-i1utests.vcxproj
+++ b/win32build/VS2010/log-i1utests/log-i1utests.vcxproj
@@ -49,8 +49,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -68,8 +67,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
diff --git a/win32build/VS2010/log-i2utests/log-i2utests.vcxproj b/win32build/VS2010/log-i2utests/log-i2utests.vcxproj
index e8e6fab..ed77fa6 100755
--- a/win32build/VS2010/log-i2utests/log-i2utests.vcxproj
+++ b/win32build/VS2010/log-i2utests/log-i2utests.vcxproj
@@ -49,8 +49,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -68,8 +67,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
diff --git a/win32build/VS2010/log-lltest/log-lltest.vcxproj b/win32build/VS2010/log-lltest/log-lltest.vcxproj
index e6dc0f3..749748c 100755
--- a/win32build/VS2010/log-lltest/log-lltest.vcxproj
+++ b/win32build/VS2010/log-lltest/log-lltest.vcxproj
@@ -49,8 +49,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -72,8 +71,7 @@ copy logger_lock_test.sh.win32 logger_lock_test.sh</Command>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
diff --git a/win32build/VS2010/log-tests/log-tests.vcxproj b/win32build/VS2010/log-tests/log-tests.vcxproj
index 97870eb..510e663 100755
--- a/win32build/VS2010/log-tests/log-tests.vcxproj
+++ b/win32build/VS2010/log-tests/log-tests.vcxproj
@@ -96,13 +96,13 @@ copy tempdir.h.win32 tempdir.h
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
- <PrecompiledHeader>
- </PrecompiledHeader>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;NDEBUG;_LIB;NO_EXPECT_DEATH;BIND10HOME="%BIND10HOME%";%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
diff --git a/win32build/VS2010/resolve-tests/resolve-tests.vcxproj b/win32build/VS2010/resolve-tests/resolve-tests.vcxproj
index 59d88ff..2fd2c83 100755
--- a/win32build/VS2010/resolve-tests/resolve-tests.vcxproj
+++ b/win32build/VS2010/resolve-tests/resolve-tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -71,7 +71,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\ext\asio;..\..\..\ext\coroutine;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/resolver-tests/resolver-tests.vcxproj b/win32build/VS2010/resolver-tests/resolver-tests.vcxproj
index 92c332b..6647666 100755
--- a/win32build/VS2010/resolver-tests/resolver-tests.vcxproj
+++ b/win32build/VS2010/resolver-tests/resolver-tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -71,7 +71,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;GTEST_CREATE_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;TEST_DATA_DIR="%BIND10HOME%/src/lib/testutils/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/testutils/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\bin;..\..\..\ext\asio;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
diff --git a/win32build/VS2010/xfr-tests/xfr-tests.vcxproj b/win32build/VS2010/xfr-tests/xfr-tests.vcxproj
new file mode 100755
index 0000000..8ebeafa
--- /dev/null
+++ b/win32build/VS2010/xfr-tests/xfr-tests.vcxproj
@@ -0,0 +1,95 @@
+<?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|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{1F5C82AD-0BE1-48A7-A3E8-F03637B43B9A}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>xfrtests</RootNamespace>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>true</UseDebugLibraries>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+ <ConfigurationType>Application</ConfigurationType>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <WholeProgramOptimization>true</WholeProgramOptimization>
+ <CharacterSet>Unicode</CharacterSet>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings">
+ </ImportGroup>
+ <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <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|Win32'">
+ <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|Win32'">
+ <LinkIncremental>true</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>run_unittests</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>run_unittests</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
+ <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>libb10-log.lib;libutil_unittests.lib;libb10-xfr.lib;gtest.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <WarningLevel>Level3</WarningLevel>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <Optimization>MaxSpeed</Optimization>
+ <FunctionLevelLinking>true</FunctionLevelLinking>
+ <IntrinsicFunctions>true</IntrinsicFunctions>
+ <PreprocessorDefinitions>WIN32;GTEST_LINKED_AS_SHARED_LIBRARY=1;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <OutputFile>$(OutDir)run_unittests$(TargetExt)</OutputFile>
+ <AdditionalLibraryDirectories>..\$(Configuration);..\..\..\..\gtest\v100\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>libb10-log.lib;libutil_unittests.lib;libb10-xfr.lib;gtest.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\xfr\tests\client_test.cc" />
+ <ClCompile Include="..\..\..\src\lib\xfr\tests\run_unittests.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/xfr-tests/xfr-tests.vcxproj.filters b/win32build/VS2010/xfr-tests/xfr-tests.vcxproj.filters
new file mode 100755
index 0000000..014d9e0
--- /dev/null
+++ b/win32build/VS2010/xfr-tests/xfr-tests.vcxproj.filters
@@ -0,0 +1,25 @@
+<?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="..\..\..\src\lib\xfr\tests\client_test.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\xfr\tests\run_unittests.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/xfr-tests/xfr-tests.vcxproj.user b/win32build/VS2010/xfr-tests/xfr-tests.vcxproj.user
new file mode 100755
index 0000000..695b5c7
--- /dev/null
+++ b/win32build/VS2010/xfr-tests/xfr-tests.vcxproj.user
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>
\ No newline at end of file
diff --git a/win32build/check/all.sh b/win32build/check/all.sh
index fa99330..8cb4089 100755
--- a/win32build/check/all.sh
+++ b/win32build/check/all.sh
@@ -6,6 +6,7 @@ ${BIND10HOME}/win32build/check/dns++-all.sh && \
${BIND10HOME}/win32build/check/cc-all.sh && \
${BIND10HOME}/win32build/check/config-all.sh && \
${BIND10HOME}/win32build/check/acl-all.sh && \
+${BIND10HOME}/win32build/check/xfr-all.sh && \
${BIND10HOME}/win32build/check/bench-all.sh && \
${BIND10HOME}/win32build/check/asiolink-all.sh && \
${BIND10HOME}/win32build/check/asiodns-all.sh && \
@@ -19,6 +20,8 @@ ${BIND10HOME}/win32build/check/dhcp++-all.sh && \
${BIND10HOME}/win32build/check/statistics-all.sh && \
${BIND10HOME}/win32build/check/cfgmgr-all.sh && \
${BIND10HOME}/win32build/check/loadzone-all.sh && \
+${BIND10HOME}/win32build/check/stats-all.sh && \
${BIND10HOME}/win32build/check/resolver-all.sh && \
${BIND10HOME}/win32build/check/dhcp6-all.sh && \
-${BIND10HOME}/win32build/check/dbutil-all.sh
+${BIND10HOME}/win32build/check/dbutil-all.sh && \
+${BIND10HOME}/win32build/check/badpacket-all.sh
diff --git a/win32build/check/badpacket-all.sh b/win32build/check/badpacket-all.sh
new file mode 100755
index 0000000..a354eff
--- /dev/null
+++ b/win32build/check/badpacket-all.sh
@@ -0,0 +1,2 @@
+${BIND10HOME}/win32build/check/badpacket-release.sh && \
+${BIND10HOME}/win32build/check/badpacket-debug.sh
diff --git a/win32build/check/badpacket-debug.sh b/win32build/check/badpacket-debug.sh
new file mode 100755
index 0000000..194abe3
--- /dev/null
+++ b/win32build/check/badpacket-debug.sh
@@ -0,0 +1,5 @@
+. ${BIND10HOME}/win32build/env-debug.sh
+echo
+echo badpacket-tests / Debug
+echo
+${BIND10HOME}/win32build/${VSVER}/badpacket-tests/Debug/run_unittests.exe
diff --git a/win32build/check/badpacket-release.sh b/win32build/check/badpacket-release.sh
new file mode 100755
index 0000000..e70ef32
--- /dev/null
+++ b/win32build/check/badpacket-release.sh
@@ -0,0 +1,5 @@
+. ${BIND10HOME}/win32build/env-release.sh
+echo
+echo badpacket-tests / Release
+echo
+${BIND10HOME}/win32build/${VSVER}/badpacket-tests/Release/run_unittests.exe
diff --git a/win32build/check/debug-all.sh b/win32build/check/debug-all.sh
index 9ce9f7e..4e6f397 100755
--- a/win32build/check/debug-all.sh
+++ b/win32build/check/debug-all.sh
@@ -6,6 +6,7 @@ ${BIND10HOME}/win32build/check/dns++-debug.sh && \
${BIND10HOME}/win32build/check/cc-debug.sh && \
${BIND10HOME}/win32build/check/config-debug.sh && \
${BIND10HOME}/win32build/check/acl-debug.sh && \
+${BIND10HOME}/win32build/check/xfr-debug.sh && \
${BIND10HOME}/win32build/check/bench-debug.sh && \
${BIND10HOME}/win32build/check/asiolink-debug.sh && \
${BIND10HOME}/win32build/check/asiodns-debug.sh && \
@@ -19,6 +20,8 @@ ${BIND10HOME}/win32build/check/dhcp++-debug.sh && \
${BIND10HOME}/win32build/check/statistics-debug.sh && \
${BIND10HOME}/win32build/check/cfgmgr-debug.sh && \
${BIND10HOME}/win32build/check/loadzone-debug.sh && \
+${BIND10HOME}/win32build/check/stats-debug.sh && \
${BIND10HOME}/win32build/check/resolver-debug.sh && \
${BIND10HOME}/win32build/check/dhcp6-debug.sh && \
-${BIND10HOME}/win32build/check/dbutil-debug.sh
+${BIND10HOME}/win32build/check/dbutil-debug.sh && \
+${BIND10HOME}/win32build/check/badpacket-debug.sh
diff --git a/win32build/check/release-all.sh b/win32build/check/release-all.sh
index b259844..101cf97 100755
--- a/win32build/check/release-all.sh
+++ b/win32build/check/release-all.sh
@@ -6,6 +6,7 @@ ${BIND10HOME}/win32build/check/dns++-release.sh && \
${BIND10HOME}/win32build/check/cc-release.sh && \
${BIND10HOME}/win32build/check/config-release.sh && \
${BIND10HOME}/win32build/check/acl-release.sh && \
+${BIND10HOME}/win32build/check/xfr-release.sh && \
${BIND10HOME}/win32build/check/bench-release.sh && \
${BIND10HOME}/win32build/check/asiolink-release.sh && \
${BIND10HOME}/win32build/check/asiodns-release.sh && \
@@ -19,6 +20,8 @@ ${BIND10HOME}/win32build/check/dhcp++-release.sh && \
${BIND10HOME}/win32build/check/statistics-release.sh && \
${BIND10HOME}/win32build/check/cfgmgr-release.sh && \
${BIND10HOME}/win32build/check/loadzone-release.sh && \
+${BIND10HOME}/win32build/check/stats-release.sh && \
${BIND10HOME}/win32build/check/resolver-release.sh && \
${BIND10HOME}/win32build/check/dhcp6-release.sh && \
-${BIND10HOME}/win32build/check/dbutil-release.sh
+${BIND10HOME}/win32build/check/dbutil-release.sh && \
+${BIND10HOME}/win32build/check/badpacket-release.sh
diff --git a/win32build/check/stats-all.sh b/win32build/check/stats-all.sh
new file mode 100755
index 0000000..945797e
--- /dev/null
+++ b/win32build/check/stats-all.sh
@@ -0,0 +1,2 @@
+${BIND10HOME}/win32build/check/stats-release.sh && \
+${BIND10HOME}/win32build/check/stats-debug.sh
diff --git a/win32build/check/stats-debug.sh b/win32build/check/stats-debug.sh
new file mode 100755
index 0000000..644292b
--- /dev/null
+++ b/win32build/check/stats-debug.sh
@@ -0,0 +1,29 @@
+. ${BIND10HOME}/win32build/env-debug.sh
+echo
+echo skipping stats-tests / Debug
+echo
+exit 0
+if [ ${PYTHON} == "None" ]; then
+ echo skipping stats python / Debug
+ exit 0
+fi
+export TESTDATA_PATH=${BIND10HOME}/src/bin/stats/tests/testdata
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/stats"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/stats/tests"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/msgq"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/config"
+export B10_FROM_SOURCE=${BIND10HOME}
+export BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
+export CONFIG_TESTDATA_PATH=${BIND10HOME}/src/lib/config/tests/testdata
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+PYTESTS='b10-stats_test.py b10-stats-httpd_test.py'
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/bin/stats/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
diff --git a/win32build/check/stats-release.sh b/win32build/check/stats-release.sh
new file mode 100755
index 0000000..670eb0b
--- /dev/null
+++ b/win32build/check/stats-release.sh
@@ -0,0 +1,29 @@
+. ${BIND10HOME}/win32build/env-release.sh
+echo
+echo skipping stats-tests / Release
+echo
+exit 0
+if [ ${PYTHON} == "None" ]; then
+ echo skipping stats python / Release
+ exit 0
+fi
+export TESTDATA_PATH=${BIND10HOME}/src/bin/stats/tests/testdata
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/log_messages"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/stats"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/stats/tests"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/bin/msgq"
+export PYTHONPATH="${PYTHONPATH};${BIND10HOME}/src/lib/python/isc/config"
+export B10_FROM_SOURCE=${BIND10HOME}
+export BIND10_MSGQ_SOCKET_FILE=${BIND10HOME}/msgq_socket
+export CONFIG_TESTDATA_PATH=${BIND10HOME}/src/lib/config/tests/testdata
+export B10_LOCKFILE_DIR_FROM_BUILD=${BIND10HOME}
+PYTESTS='b10-stats_test.py b10-stats-httpd_test.py'
+for pytest in ${PYTESTS}
+ do
+ echo ${pytest}
+ ${PYTHON} ${BIND10HOME}/src/bin/stats/tests/${pytest}
+ if test $? -ne 0; then
+ exit -1
+ fi
+ done
diff --git a/win32build/check/xfr-all.sh b/win32build/check/xfr-all.sh
new file mode 100755
index 0000000..7f01ba2
--- /dev/null
+++ b/win32build/check/xfr-all.sh
@@ -0,0 +1,2 @@
+${BIND10HOME}/win32build/check/xfr-release.sh && \
+${BIND10HOME}/win32build/check/xfr-debug.sh
diff --git a/win32build/check/xfr-debug.sh b/win32build/check/xfr-debug.sh
new file mode 100755
index 0000000..27208e9
--- /dev/null
+++ b/win32build/check/xfr-debug.sh
@@ -0,0 +1,5 @@
+. ${BIND10HOME}/win32build/env-debug.sh
+echo
+echo xfr-tests / Debug
+echo
+${BIND10HOME}/win32build/${VSVER}/xfr-tests/Debug/run_unittests.exe
diff --git a/win32build/check/xfr-release.sh b/win32build/check/xfr-release.sh
new file mode 100755
index 0000000..4e8634c
--- /dev/null
+++ b/win32build/check/xfr-release.sh
@@ -0,0 +1,5 @@
+. ${BIND10HOME}/win32build/env-release.sh
+echo
+echo xfr-tests / Release
+echo
+${BIND10HOME}/win32build/${VSVER}/xfr-tests/Release/run_unittests.exe
More information about the bind10-changes
mailing list