BIND 10 trac826, updated. 60b11d9f8471115ebab1ecdb26e4745ea31d5d05 add NO_EXPECT_DEATH and VS 2008 new liblog_*

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Jun 27 11:21:37 UTC 2012


The branch, trac826 has been updated
       via  60b11d9f8471115ebab1ecdb26e4745ea31d5d05 (commit)
      from  66b1625e132cff985676778e0b9211eeca48cdb0 (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 60b11d9f8471115ebab1ecdb26e4745ea31d5d05
Author: Francis Dupont <fdupont at isc.org>
Date:   Wed Jun 27 13:21:26 2012 +0200

    add NO_EXPECT_DEATH and VS 2008 new liblog_*

-----------------------------------------------------------------------

Summary of changes:
 src/lib/log/tests/log_formatter_unittest.cc        |    2 +-
 src/lib/log/tests/logger_unittest.cc               |    2 +-
 .../log/tests/message_initializer_2_unittest.cc    |    2 +-
 src/lib/util/tests/buffer_unittest.cc              |    4 +-
 win32build/VS2008/bind10.sln                       |   39 +++++++++++++-
 .../liblog_i1utests.vcproj}                        |   32 ++++++------
 .../liblog_i2utests.vcproj}                        |   30 +++++------
 .../liblog_lltest.vcproj}                          |   55 +++++++++++++-------
 win32build/VS2008/liblog_tests/liblog_tests.vcproj |   22 ++++----
 .../VS2008/libutil_tests/libutil_tests.vcproj      |    2 +-
 win32build/VS2010/bind10.sln                       |   36 +++++++++++++
 .../VS2010/liblog_i2utests/liblog_i2utests.vcxproj |    2 +-
 .../VS2010/liblog_tests/liblog_tests.vcxproj       |    4 +-
 .../VS2010/libutil_tests/libutil_tests.vcxproj     |    2 +-
 14 files changed, 163 insertions(+), 71 deletions(-)
 copy win32build/VS2008/{libcryptolink_tests/libcryptolink_tests.vcproj => liblog_i1utests/liblog_i1utests.vcproj} (75%)
 copy win32build/VS2008/{libcryptolink_tests/libcryptolink_tests.vcproj => liblog_i2utests/liblog_i2utests.vcproj} (75%)
 copy win32build/VS2008/{liblog_iltest/liblog_iltest.vcproj => liblog_lltest/liblog_lltest.vcproj} (73%)

-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/log_formatter_unittest.cc b/src/lib/log/tests/log_formatter_unittest.cc
index 435b200..a555448 100644
--- a/src/lib/log/tests/log_formatter_unittest.cc
+++ b/src/lib/log/tests/log_formatter_unittest.cc
@@ -115,7 +115,7 @@ TEST_F(FormatterTest, mismatchedPlaceholders) {
                  arg("argument").arg("missing"),
                  isc::log::MismatchedPlaceholders);
 
-#ifdef EXPECT_DEATH
+#if defined(EXPECT_DEATH) && !defined(NO_EXPECT_DEATH)
     // Likewise, if there's a redundant placeholder (or missing argument), the
     // check detects it and aborts the program.  Due to the restriction of the
     // current implementation, it doesn't throw.
diff --git a/src/lib/log/tests/logger_unittest.cc b/src/lib/log/tests/logger_unittest.cc
index 14fe92e..d047c77 100644
--- a/src/lib/log/tests/logger_unittest.cc
+++ b/src/lib/log/tests/logger_unittest.cc
@@ -372,7 +372,7 @@ TEST_F(LoggerTest, LoggerNameLength) {
 
     // Note: Not all systems have EXPECT_DEATH.  As it is a macro we can just
     // test for its presence and bypass the test if not available.
-#ifdef EXPECT_DEATH
+#if defined(EXPECT_DEATH) && !defined(NO_EXPECT_DEATH)
     // Too long a logger name should trigger an assertion failure.
     // Note that we just check that it dies - we don't check what message is
     // output.
diff --git a/src/lib/log/tests/message_initializer_2_unittest.cc b/src/lib/log/tests/message_initializer_2_unittest.cc
index b479eee..2adc5fd 100644
--- a/src/lib/log/tests/message_initializer_2_unittest.cc
+++ b/src/lib/log/tests/message_initializer_2_unittest.cc
@@ -41,7 +41,7 @@ TEST(MessageInitializerTest2, MessageLoadTest) {
 
     // Note: Not all systems have EXPECT_DEATH.  As it is a macro we can just
     // test for its presence and bypass the test if not available.
-#ifdef EXPECT_DEATH
+#if defined(EXPECT_DEATH) && !defined(NO_EXPECT_DEATH)
     // Adding one more should take us over the limit.
     EXPECT_DEATH({
         isc::util::unittests::dontCreateCoreDumps();
diff --git a/src/lib/util/tests/buffer_unittest.cc b/src/lib/util/tests/buffer_unittest.cc
index 9af3d57..2d5a2b7 100644
--- a/src/lib/util/tests/buffer_unittest.cc
+++ b/src/lib/util/tests/buffer_unittest.cc
@@ -16,7 +16,7 @@
 
 #include <exceptions/exceptions.h>
 
-#ifdef EXPECT_DEATH
+#if defined(EXPECT_DEATH) && !defined(NO_EXPECT_DEATH)
 #include <util/unittests/resource.h>
 #endif /* EXPECT_DEATH */
 
@@ -186,7 +186,7 @@ TEST_F(BufferTest, outputBufferReadat) {
     for (int i = 0; i < sizeof(testdata); i ++) {
         EXPECT_EQ(testdata[i], obuffer[i]);
     }
-#ifdef EXPECT_DEATH
+#if defined(EXPECT_DEATH) && !defined(NO_EXPECT_DEATH)
     // We use assert now, so we check it dies
     EXPECT_DEATH({
         isc::util::unittests::dontCreateCoreDumps();
diff --git a/win32build/VS2008/bind10.sln b/win32build/VS2008/bind10.sln
index 64619cc..4b82d17 100755
--- a/win32build/VS2008/bind10.sln
+++ b/win32build/VS2008/bind10.sln
@@ -1,6 +1,6 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\BINDInstall.vcproj", "{037FE4D5-39B8-4E16-9079-77954AFA21DB}"
 	ProjectSection(ProjectDependencies) = postProject
 		{9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017} = {9C6C5E00-5D4F-4149-88A7-AFDCDC7C5017}
@@ -156,6 +156,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog", "liblog\liblog.vcp
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_tests", "liblog_tests\liblog_tests.vcproj", "{9437FF4D-3CCE-45F1-A248-6B713FBF0A5D}"
 	ProjectSection(ProjectDependencies) = postProject
+		{0633A915-9440-4A79-BA4E-070CC0140F72} = {0633A915-9440-4A79-BA4E-070CC0140F72}
 		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
 		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
 		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
@@ -529,6 +530,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tt-badpacket_tests", "tt-ba
 		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_lltest", "liblog_lltest\liblog_lltest.vcproj", "{D9997E45-CF24-4DD1-A837-AB6F60273653}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{9437FF4D-3CCE-45F1-A248-6B713FBF0A5D} = {9437FF4D-3CCE-45F1-A248-6B713FBF0A5D}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_i1utests", "liblog_i1utests\liblog_i1utests.vcproj", "{2D3532B9-30AB-4325-94FF-C2A3F764CD79}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_i2utests", "liblog_i2utests\liblog_i2utests.vcproj", "{2A91C578-0DDA-4957-958D-28AD11266275}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+		{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+		{06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
+		{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -775,6 +800,18 @@ Global
 		{8AC71185-0619-477C-8C15-0E59D6DEB127}.Debug|Win32.Build.0 = Debug|Win32
 		{8AC71185-0619-477C-8C15-0E59D6DEB127}.Release|Win32.ActiveCfg = Release|Win32
 		{8AC71185-0619-477C-8C15-0E59D6DEB127}.Release|Win32.Build.0 = Release|Win32
+		{D9997E45-CF24-4DD1-A837-AB6F60273653}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D9997E45-CF24-4DD1-A837-AB6F60273653}.Debug|Win32.Build.0 = Debug|Win32
+		{D9997E45-CF24-4DD1-A837-AB6F60273653}.Release|Win32.ActiveCfg = Release|Win32
+		{D9997E45-CF24-4DD1-A837-AB6F60273653}.Release|Win32.Build.0 = Release|Win32
+		{2D3532B9-30AB-4325-94FF-C2A3F764CD79}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2D3532B9-30AB-4325-94FF-C2A3F764CD79}.Debug|Win32.Build.0 = Debug|Win32
+		{2D3532B9-30AB-4325-94FF-C2A3F764CD79}.Release|Win32.ActiveCfg = Release|Win32
+		{2D3532B9-30AB-4325-94FF-C2A3F764CD79}.Release|Win32.Build.0 = Release|Win32
+		{2A91C578-0DDA-4957-958D-28AD11266275}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2A91C578-0DDA-4957-958D-28AD11266275}.Debug|Win32.Build.0 = Debug|Win32
+		{2A91C578-0DDA-4957-958D-28AD11266275}.Release|Win32.ActiveCfg = Release|Win32
+		{2A91C578-0DDA-4957-958D-28AD11266275}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32build/VS2008/liblog_i1utests/liblog_i1utests.vcproj b/win32build/VS2008/liblog_i1utests/liblog_i1utests.vcproj
new file mode 100755
index 0000000..d9565c5
--- /dev/null
+++ b/win32build/VS2008/liblog_i1utests/liblog_i1utests.vcproj
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="liblog_i1utests"
+	ProjectGUID="{2D3532B9-30AB-4325-94FF-C2A3F764CD79}"
+	RootNamespace="liblog_i1utests"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib log4cplusSD.lib gtestd.lib"
+				OutputFile="$(OutDir)\initializer_unittests_1.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib log4cplusS.lib gtest.lib"
+				OutputFile="$(OutDir)\initializer_unittests_1.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\message_initializer_1_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\message_initializer_1a_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\run_initializer_unittests.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/liblog_i2utests/liblog_i2utests.vcproj b/win32build/VS2008/liblog_i2utests/liblog_i2utests.vcproj
new file mode 100755
index 0000000..cda1acc
--- /dev/null
+++ b/win32build/VS2008/liblog_i2utests/liblog_i2utests.vcproj
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="liblog_i2utests"
+	ProjectGUID="{2A91C578-0DDA-4957-958D-28AD11266275}"
+	RootNamespace="liblog_i2utests"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib log4cplusSD.lib gtestd.lib"
+				OutputFile="$(OutDir)\initializer_unittests_2.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_EXPECT_DEATH"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib libutil_unittests.lib liblog.lib log4cplusS.lib gtest.lib"
+				OutputFile="$(OutDir)\initializer_unittests_2.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\libutil_unittests\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)";"..\..\..\..\gtest\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\message_initializer_2_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\run_initializer_unittests.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/liblog_lltest/liblog_lltest.vcproj b/win32build/VS2008/liblog_lltest/liblog_lltest.vcproj
new file mode 100755
index 0000000..aa2fb0f
--- /dev/null
+++ b/win32build/VS2008/liblog_lltest/liblog_lltest.vcproj
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="liblog_lltest"
+	ProjectGUID="{D9997E45-CF24-4DD1-A837-AB6F60273653}"
+	RootNamespace="liblog_lltest"
+	Keyword="ManagedCProj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="0"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;_DEBUG"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="4"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib log4cplusSD.lib"
+				OutputFile="$(OutDir)\logger_lock_test.exe"
+				LinkIncremental="2"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="1"
+			ManagedExtensions="0"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="..\..;..\..\..\src\lib;"$(BOOST)""
+				PreprocessorDefinitions="WIN32;NDEBUG"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libexceptions.lib libutil.lib liblog.lib log4cplusS.lib"
+				OutputFile="$(OutDir)\logger_lock_test.exe"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories=""..\libexceptions\$(ConfigurationName)";"..\libutil\$(ConfigurationName)";"..\liblog\$(ConfigurationName)";"..\..\..\..\log4cplus\md9\$(ConfigurationName)""
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Data.dll"
+			AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.XML.dll"
+			AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\log_test_messages.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\logger_lock_test.cc"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\log_test_messages.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/win32build/VS2008/liblog_tests/liblog_tests.vcproj b/win32build/VS2008/liblog_tests/liblog_tests.vcproj
index a8380dd..577c83a 100755
--- a/win32build/VS2008/liblog_tests/liblog_tests.vcproj
+++ b/win32build/VS2008/liblog_tests/liblog_tests.vcproj
@@ -25,7 +25,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy tempdir.h.win32 tempdir.h&#x0D;&#x0A;"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy tempdir.h.win32 tempdir.h&#x0D;&#x0A;..\..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe log_test_messages.mes"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -103,7 +103,7 @@
 			>
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy tempdir.h.win32 tempdir.h&#x0D;&#x0A;"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy tempdir.h.win32 tempdir.h&#x0D;&#x0A;..\..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe log_test_messages.mes"
 			/>
 			<Tool
 				Name="VCCustomBuildTool"
@@ -122,7 +122,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;"$(BOOST)""
-				PreprocessorDefinitions="BIND10HOME=\"$(BIND10HOME)\""
+				PreprocessorDefinitions="NO_EXPECT_DEATH;BIND10HOME=\"$(BIND10HOME)\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -187,6 +187,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\src\lib\log\tests\log_test_messages.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\src\lib\log\tests\logger_level_impl_unittest.cc"
 				>
 			</File>
@@ -219,15 +223,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\tests\message_initializer_unittest.cc"
-				>
-			</File>
-			<File
-				RelativePath="..\..\..\src\lib\log\tests\message_initializer_unittest_2.cc"
+				RelativePath="..\..\..\src\lib\log\tests\message_reader_unittest.cc"
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\src\lib\log\tests\message_reader_unittest.cc"
+				RelativePath="..\..\..\src\lib\log\output_option.cc"
 				>
 			</File>
 			<File
@@ -240,6 +240,10 @@
 			Filter="h;hpp;hxx;hm;inl;inc;xsd"
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
+			<File
+				RelativePath="..\..\..\src\lib\log\tests\log_test_messages.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Resource Files"
diff --git a/win32build/VS2008/libutil_tests/libutil_tests.vcproj b/win32build/VS2008/libutil_tests/libutil_tests.vcproj
index 299180f..f4e3ba6 100755
--- a/win32build/VS2008/libutil_tests/libutil_tests.vcproj
+++ b/win32build/VS2008/libutil_tests/libutil_tests.vcproj
@@ -120,7 +120,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\utils;..\..\..\..\gtest\include;"$(BOOST)""
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;TEST_DATA_TOPBUILDDIR=\"$(BIND10HOME)\""
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;NO_EXPECT_DEATH;TEST_DATA_TOPBUILDDIR=\"$(BIND10HOME)\""
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/win32build/VS2010/bind10.sln b/win32build/VS2010/bind10.sln
index 2a4394a..2251ec9 100755
--- a/win32build/VS2010/bind10.sln
+++ b/win32build/VS2010/bind10.sln
@@ -516,6 +516,30 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tt-badpacket_tests", "tt-ba
 		{2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_lltest", "liblog_lltest\liblog_lltest.vcxproj", "{6A29BC58-CA6E-4196-8E88-C675FE944BBF}"
+	ProjectSection(ProjectDependencies) = postProject
+		{9F69DE07-D285-4B5C-8528-DF975C59ED3B} = {9F69DE07-D285-4B5C-8528-DF975C59ED3B}
+		{7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
+		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_i1utests", "liblog_i1utests\liblog_i1utests.vcxproj", "{1CCFABAC-5A0B-499F-914E-AAD0371EEC4F}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
+		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+		{2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
+		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_i2utests", "liblog_i2utests\liblog_i2utests.vcxproj", "{9FBAAE48-1543-41C9-80EA-A65E7C1D1A98}"
+	ProjectSection(ProjectDependencies) = postProject
+		{7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
+		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+		{2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
+		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -762,6 +786,18 @@ Global
 		{3D451C9D-2AE7-4E8D-93B8-4E5470064FF5}.Debug|Win32.Build.0 = Debug|Win32
 		{3D451C9D-2AE7-4E8D-93B8-4E5470064FF5}.Release|Win32.ActiveCfg = Release|Win32
 		{3D451C9D-2AE7-4E8D-93B8-4E5470064FF5}.Release|Win32.Build.0 = Release|Win32
+		{6A29BC58-CA6E-4196-8E88-C675FE944BBF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{6A29BC58-CA6E-4196-8E88-C675FE944BBF}.Debug|Win32.Build.0 = Debug|Win32
+		{6A29BC58-CA6E-4196-8E88-C675FE944BBF}.Release|Win32.ActiveCfg = Release|Win32
+		{6A29BC58-CA6E-4196-8E88-C675FE944BBF}.Release|Win32.Build.0 = Release|Win32
+		{1CCFABAC-5A0B-499F-914E-AAD0371EEC4F}.Debug|Win32.ActiveCfg = Debug|Win32
+		{1CCFABAC-5A0B-499F-914E-AAD0371EEC4F}.Debug|Win32.Build.0 = Debug|Win32
+		{1CCFABAC-5A0B-499F-914E-AAD0371EEC4F}.Release|Win32.ActiveCfg = Release|Win32
+		{1CCFABAC-5A0B-499F-914E-AAD0371EEC4F}.Release|Win32.Build.0 = Release|Win32
+		{9FBAAE48-1543-41C9-80EA-A65E7C1D1A98}.Debug|Win32.ActiveCfg = Debug|Win32
+		{9FBAAE48-1543-41C9-80EA-A65E7C1D1A98}.Debug|Win32.Build.0 = Debug|Win32
+		{9FBAAE48-1543-41C9-80EA-A65E7C1D1A98}.Release|Win32.ActiveCfg = Release|Win32
+		{9FBAAE48-1543-41C9-80EA-A65E7C1D1A98}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/win32build/VS2010/liblog_i2utests/liblog_i2utests.vcxproj b/win32build/VS2010/liblog_i2utests/liblog_i2utests.vcxproj
index 8af5ff0..b3a4a38 100755
--- a/win32build/VS2010/liblog_i2utests/liblog_i2utests.vcxproj
+++ b/win32build/VS2010/liblog_i2utests/liblog_i2utests.vcxproj
@@ -73,7 +73,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_EXPECT_DEATH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
diff --git a/win32build/VS2010/liblog_tests/liblog_tests.vcxproj b/win32build/VS2010/liblog_tests/liblog_tests.vcxproj
index b6fc939..4956b3f 100755
--- a/win32build/VS2010/liblog_tests/liblog_tests.vcxproj
+++ b/win32build/VS2010/liblog_tests/liblog_tests.vcxproj
@@ -74,7 +74,7 @@
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level4</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;BIND10HOME="%BIND10HOME%";_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;BIND10HOME="%BIND10HOME%";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>
@@ -99,7 +99,7 @@ copy tempdir.h.win32 tempdir.h
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;BIND10HOME="%BIND10HOME%";NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;NO_EXPECT_DEATH;BIND10HOME="%BIND10HOME%";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\log;..\..\..\..\log4cplus\include;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
diff --git a/win32build/VS2010/libutil_tests/libutil_tests.vcxproj b/win32build/VS2010/libutil_tests/libutil_tests.vcxproj
index f0b934a..c02eedd 100755
--- a/win32build/VS2010/libutil_tests/libutil_tests.vcxproj
+++ b/win32build/VS2010/libutil_tests/libutil_tests.vcxproj
@@ -71,7 +71,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;TEST_DATA_TOPBUILDDIR="%BIND10HOME%";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;NO_EXPECT_DEATH;TEST_DATA_TOPBUILDDIR="%BIND10HOME%";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\exceptions;..\..\..\src\lib\utils;..\..\..\..\gtest\include;%BOOST%;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CompileAs>CompileAsCpp</CompileAs>
     </ClCompile>



More information about the bind10-changes mailing list