BIND 10 trac826, updated. 952cea8a257522d55e4bcba4fcdb6e55cddbd889 [trac826] Ported log run time init test (including a bug fix).
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri May 6 15:48:56 UTC 2011
The branch, trac826 has been updated
via 952cea8a257522d55e4bcba4fcdb6e55cddbd889 (commit)
from 39670a9a69f67847fb4e2b33866a1e15374f9288 (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 952cea8a257522d55e4bcba4fcdb6e55cddbd889
Author: Francis Dupont <fdupont at isc.org>
Date: Fri May 6 17:47:53 2011 +0200
[trac826] Ported log run time init test (including a bug fix).
-----------------------------------------------------------------------
Summary of changes:
src/lib/log/logger.cc | 10 ++--
src/lib/log/logger.h | 10 ++--
src/lib/log/tests/logger_support_test.cc | 6 ++-
...init_test.sh.in => run_time_init_test.sh.win32} | 52 ++++++++++----------
win32build/VS2008/bind10.sln | 12 +++++
.../liblog_rtitest.vcproj} | 22 +++++----
win32build/VS2010/bind10.sln | 11 ++++
.../liblog_rtitest.vcxproj} | 38 ++++++++++----
.../liblog_rtitest.vcxproj.filters} | 14 +++---
.../liblog_rtitest.vcxproj.user} | 0
10 files changed, 110 insertions(+), 65 deletions(-)
delete mode 100644 src/lib/dns/benchmarks/NO_PORT_ON_WINDOWS
copy src/lib/log/tests/{run_time_init_test.sh.in => run_time_init_test.sh.win32} (85%)
copy win32build/VS2008/{liblog_compiler/liblog_compiler.vcproj => liblog_rtitest/liblog_rtitest.vcproj} (78%)
copy win32build/VS2010/{liblog_compiler/liblog_compiler.vcxproj => liblog_rtitest/liblog_rtitest.vcxproj} (76%)
copy win32build/VS2010/{liblog_compiler/liblog_compiler.vcxproj.filters => liblog_rtitest/liblog_rtitest.vcxproj.filters} (90%)
copy win32build/VS2010/{BINDInstall/BINDInstall.vcxproj.user => liblog_rtitest/liblog_rtitest.vcxproj.user} (100%)
-----------------------------------------------------------------------
diff --git a/src/lib/dns/benchmarks/NO_PORT_ON_WINDOWS b/src/lib/dns/benchmarks/NO_PORT_ON_WINDOWS
deleted file mode 100644
index e69de29..0000000
diff --git a/src/lib/log/logger.cc b/src/lib/log/logger.cc
index 99dc3a1..198efbd 100644
--- a/src/lib/log/logger.cc
+++ b/src/lib/log/logger.cc
@@ -112,7 +112,7 @@ Logger::isFatalEnabled() {
// Output methods
void
-Logger::debug(int dbglevel, const isc::log::MessageID& ident, ...) {
+Logger::debug(int dbglevel, const isc::log::MessageID ident, ...) {
if (isDebugEnabled(dbglevel)) {
va_list ap;
va_start(ap, ident);
@@ -122,7 +122,7 @@ Logger::debug(int dbglevel, const isc::log::MessageID& ident, ...) {
}
void
-Logger::info(const isc::log::MessageID& ident, ...) {
+Logger::info(const isc::log::MessageID ident, ...) {
if (isInfoEnabled()) {
va_list ap;
va_start(ap, ident);
@@ -132,7 +132,7 @@ Logger::info(const isc::log::MessageID& ident, ...) {
}
void
-Logger::warn(const isc::log::MessageID& ident, ...) {
+Logger::warn(const isc::log::MessageID ident, ...) {
if (isWarnEnabled()) {
va_list ap;
va_start(ap, ident);
@@ -142,7 +142,7 @@ Logger::warn(const isc::log::MessageID& ident, ...) {
}
void
-Logger::error(const isc::log::MessageID& ident, ...) {
+Logger::error(const isc::log::MessageID ident, ...) {
if (isErrorEnabled()) {
va_list ap;
va_start(ap, ident);
@@ -152,7 +152,7 @@ Logger::error(const isc::log::MessageID& ident, ...) {
}
void
-Logger::fatal(const isc::log::MessageID& ident, ...) {
+Logger::fatal(const isc::log::MessageID ident, ...) {
if (isFatalEnabled()) {
va_list ap;
va_start(ap, ident);
diff --git a/src/lib/log/logger.h b/src/lib/log/logger.h
index 88e88e2..f35d5ac 100644
--- a/src/lib/log/logger.h
+++ b/src/lib/log/logger.h
@@ -158,35 +158,35 @@ public:
/// are used for more verbose output.
/// \param ident Message identification.
/// \param ... Optional arguments for the message.
- void debug(int dbglevel, const MessageID& ident, ...);
+ void debug(int dbglevel, const MessageID ident, ...);
/// \brief Output Informational Message
///
/// \param ident Message identification.
/// \param ... Optional arguments for the message.
- void info(const MessageID& ident, ...);
+ void info(const MessageID ident, ...);
/// \brief Output Warning Message
///
/// \param ident Message identification.
/// \param ... Optional arguments for the message.
- void warn(const MessageID& ident, ...);
+ void warn(const MessageID ident, ...);
/// \brief Output Error Message
///
/// \param ident Message identification.
/// \param ... Optional arguments for the message.
- void error(const MessageID& ident, ...);
+ void error(const MessageID ident, ...);
/// \brief Output Fatal Message
///
/// \param ident Message identification.
/// \param ... Optional arguments for the message.
- void fatal(const MessageID& ident, ...);
+ void fatal(const MessageID ident, ...);
/// \brief Equality
///
diff --git a/src/lib/log/tests/logger_support_test.cc b/src/lib/log/tests/logger_support_test.cc
index 4d8863e..fc571ba 100644
--- a/src/lib/log/tests/logger_support_test.cc
+++ b/src/lib/log/tests/logger_support_test.cc
@@ -17,8 +17,12 @@
/// Simple example program showing how to use the logger.
#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
+#ifdef _WIN32
+#include <getopt.h>
+#else
+#include <unistd.h>
+#endif
#include <iostream>
diff --git a/src/lib/log/tests/run_time_init_test.sh.win32 b/src/lib/log/tests/run_time_init_test.sh.win32
new file mode 100755
index 0000000..86b01f7
--- /dev/null
+++ b/src/lib/log/tests/run_time_init_test.sh.win32
@@ -0,0 +1,89 @@
+#!/bin/sh
+# Copyright (C) 2011 Internet Systems Consortium, Inc. ("ISC")
+#
+# Permission to use, copy, modify, and/or distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+# INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+# LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+
+failcount=0
+localmes=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/localdef_mes_$$
+tempfile=c:/cygwin/home/fdupont/bind10.trac826/src/lib/log/tests/run_time_init_test_tempfile_$$
+
+passfail() {
+ if [ $1 -eq 0 ]; then
+ echo "pass"
+ else
+ echo "FAIL"
+ fi
+ failcount=`expr $failcount + $1`
+}
+
+# Create the local message file for testing
+
+cat > $localmes << .
+NOTHERE this message is not in the global dictionary
+MSGRDERR replacement read error, parameters: '%s' and '%s'
+UNRECDIR replacement unrecognised directive message, parameter is '%s'
+.
+
+echo -n "1. runInitTest default parameters: "
+cat > $tempfile << .
+FATAL [alpha.example] MSGWRTERR, error writing to test1: 42
+ERROR [alpha.example] UNRECDIR, unrecognised directive 'false'
+WARN [alpha.dlm] MSGRDERR, error reading from message file a.txt: dummy test
+INFO [alpha.dlm] OPNMSGIN, unable to open message file example.msg for input: dummy test
+.
+./logger_support_test.exe | cut -d' ' -f3- | diff $tempfile -
+passfail $?
+
+echo -n "2. Severity filter: "
+cat > $tempfile << .
+FATAL [alpha.example] MSGWRTERR, error writing to test1: 42
+ERROR [alpha.example] UNRECDIR, unrecognised directive 'false'
+.
+./logger_support_test.exe -s error | cut -d' ' -f3- | diff $tempfile -
+passfail $?
+
+echo -n "3. Debug level: "
+cat > $tempfile << .
+FATAL [alpha.example] MSGWRTERR, error writing to test1: 42
+ERROR [alpha.example] UNRECDIR, unrecognised directive 'false'
+WARN [alpha.dlm] MSGRDERR, error reading from message file a.txt: dummy test
+INFO [alpha.dlm] OPNMSGIN, unable to open message file example.msg for input: dummy test
+DEBUG [alpha.example] UNRECDIR, unrecognised directive '[abc]'
+DEBUG [alpha.example] UNRECDIR, unrecognised directive '[24]'
+DEBUG [alpha.example] UNRECDIR, unrecognised directive '[25]'
+.
+./logger_support_test.exe -s debug -d 25 | cut -d' ' -f3- | diff $tempfile -
+passfail $?
+
+echo -n "4. Local message replacement: "
+cat > $tempfile << .
+WARN [alpha.log] IDNOTFND, could not replace message for 'NOTHERE': no such message identification
+FATAL [alpha.example] MSGWRTERR, error writing to test1: 42
+ERROR [alpha.example] UNRECDIR, replacement unrecognised directive message, parameter is 'false'
+WARN [alpha.dlm] MSGRDERR, replacement read error, parameters: 'a.txt' and 'dummy test'
+.
+./logger_support_test.exe -s warn $localmes | cut -d' ' -f3- | diff $tempfile -
+passfail $?
+
+rm -f $localmes
+rm -f $tempfile
+
+if [ $failcount -eq 0 ]; then
+ echo "PASS: run_time_init_test"
+elif [ $failcount -eq 1 ]; then
+ echo "FAIL: run_time_init_test - 1 test failed"
+else
+ echo "FAIL: run_time_init_test - $failcount tests failed"
+fi
+
+exit $failcount
diff --git a/win32build/VS2008/bind10.sln b/win32build/VS2008/bind10.sln
index cc80652..880217b 100755
--- a/win32build/VS2008/bind10.sln
+++ b/win32build/VS2008/bind10.sln
@@ -21,6 +21,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\
{0131E967-F93E-4E63-9561-47C94411FBEC} = {0131E967-F93E-4E63-9561-47C94411FBEC}
{CF7DB86A-D67D-4829-B63A-598E5BFC81BC} = {CF7DB86A-D67D-4829-B63A-598E5BFC81BC}
{42347681-5872-4D67-9E6B-CD0AA822DEE4} = {42347681-5872-4D67-9E6B-CD0AA822DEE4}
+ {DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE} = {DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}
{C49C6288-0381-4F7F-AD11-6E122095A876} = {C49C6288-0381-4F7F-AD11-6E122095A876}
{AB337F8E-F8DD-4013-9638-8585BF087158} = {AB337F8E-F8DD-4013-9638-8585BF087158}
{E8E425A1-74C4-43B2-9DE9-F59E496333F0} = {E8E425A1-74C4-43B2-9DE9-F59E496333F0}
@@ -82,6 +83,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns++_tests", "libdns++_
ProjectSection(ProjectDependencies) = postProject
{AFA7E20B-A78A-40E9-9639-D131D035C265} = {AFA7E20B-A78A-40E9-9639-D131D035C265}
{0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+ {06BE7A3D-800D-4665-A250-9DB588CE7BBE} = {06BE7A3D-800D-4665-A250-9DB588CE7BBE}
{F4D89262-37A8-401B-8ABD-D0E18E13E5D1} = {F4D89262-37A8-401B-8ABD-D0E18E13E5D1}
{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
EndProjectSection
@@ -269,6 +271,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns++_benchmarks", "libd
{1D545AC8-59EA-48C7-A006-C92F0C19633C} = {1D545AC8-59EA-48C7-A006-C92F0C19633C}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_rtitest", "liblog_rtitest\liblog_rtitest.vcproj", "{DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9494C92C-AF42-4897-B488-B5B416C2D392} = {9494C92C-AF42-4897-B488-B5B416C2D392}
+ {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B} = {0986A335-5EDA-4F16-8AB2-A8FA8DC5702B}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -423,6 +431,10 @@ Global
{9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Debug|Win32.Build.0 = Debug|Win32
{9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Release|Win32.ActiveCfg = Release|Win32
{9ABB5EB9-7742-4EBE-955A-0AE81B5878BA}.Release|Win32.Build.0 = Release|Win32
+ {DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}.Debug|Win32.Build.0 = Debug|Win32
+ {DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}.Release|Win32.ActiveCfg = Release|Win32
+ {DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32build/VS2008/liblog_rtitest/liblog_rtitest.vcproj b/win32build/VS2008/liblog_rtitest/liblog_rtitest.vcproj
new file mode 100755
index 0000000..7047073
--- /dev/null
+++ b/win32build/VS2008/liblog_rtitest/liblog_rtitest.vcproj
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="9.00"
+ Name="liblog_rtitest"
+ ProjectGUID="{DE8D2C87-5DDF-4A8A-954D-64B21BCB71AE}"
+ RootNamespace="liblog_rtitest"
+ 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"
+ CommandLine="cd ..\..\..\src\lib\log\tests
copy run_time_init_test.sh.win32 run_time_init_test.sh
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="0"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib"
+ 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="libutil.lib liblog.lib"
+ OutputFile="$(OutDir)\logger_support_test.exe"
+ LinkIncremental="2"
+ AdditionalLibraryDirectories="..\libutil\Debug;..\liblog\Debug"
+ 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"
+ CommandLine="copy Debug\logger_support_test.exe ..\..\..\src\lib\log\tests
"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory="$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="1"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="cd ..\..\..\src\lib\log\tests
copy run_time_init_test.sh.win32 run_time_init_test.sh
"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ EnableIntrinsicFunctions="true"
+ AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib"
+ 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="libutil.lib liblog.lib"
+ OutputFile="$(OutDir)\logger_support_test.exe"
+ LinkIncremental="1"
+ AdditionalLibraryDirectories="..\libutil\Release;..\liblog\Release"
+ 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"
+ CommandLine="copy Release\logger_support_test.exe ..\..\..\src\lib\log\tests
"
+ />
+ </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="..\..\getopt.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\log\tests\logger_support_test.cc"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;inc;xsd"
+ UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+ >
+ <File
+ RelativePath="..\..\getopt.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/VS2010/bind10.sln b/win32build/VS2010/bind10.sln
index 6db7a90..cf6cb06 100755
--- a/win32build/VS2010/bind10.sln
+++ b/win32build/VS2010/bind10.sln
@@ -24,6 +24,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BINDInstall", "BINDInstall\
{6280D58A-5E05-45D1-8B79-DF677C114CD4} = {6280D58A-5E05-45D1-8B79-DF677C114CD4}
{6AC4F7A4-9BDC-415F-81DB-6332CACA38B3} = {6AC4F7A4-9BDC-415F-81DB-6332CACA38B3}
{B5D971AD-D95B-4A15-9E31-38AEF4F69627} = {B5D971AD-D95B-4A15-9E31-38AEF4F69627}
+ {0723DEB6-E2C3-4082-91E5-0F8F4B0649F6} = {0723DEB6-E2C3-4082-91E5-0F8F4B0649F6}
{13D541BC-8365-42F7-840F-A117CA0413DD} = {13D541BC-8365-42F7-840F-A117CA0413DD}
{813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6} = {813BA1C9-8CD8-4B06-B1C0-FDAB576AC4B6}
{FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D} = {FEFFE0CB-CD6B-4E61-854C-39506D6DCD5D}
@@ -263,6 +264,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libdns++_benchmarks", "libd
{F6E728D3-A0B2-40F6-9B91-7D4474D778F3} = {F6E728D3-A0B2-40F6-9B91-7D4474D778F3}
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_rtitest", "liblog_rtitest\liblog_rtitest.vcxproj", "{0723DEB6-E2C3-4082-91E5-0F8F4B0649F6}"
+ ProjectSection(ProjectDependencies) = postProject
+ {8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+ {AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -417,6 +424,10 @@ Global
{C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}.Debug|Win32.Build.0 = Debug|Win32
{C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}.Release|Win32.ActiveCfg = Release|Win32
{C7DEAFEC-423B-486D-BBD8-896B0DE69DDE}.Release|Win32.Build.0 = Release|Win32
+ {0723DEB6-E2C3-4082-91E5-0F8F4B0649F6}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0723DEB6-E2C3-4082-91E5-0F8F4B0649F6}.Debug|Win32.Build.0 = Debug|Win32
+ {0723DEB6-E2C3-4082-91E5-0F8F4B0649F6}.Release|Win32.ActiveCfg = Release|Win32
+ {0723DEB6-E2C3-4082-91E5-0F8F4B0649F6}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/win32build/VS2010/liblog_rtitest/liblog_rtitest.vcxproj b/win32build/VS2010/liblog_rtitest/liblog_rtitest.vcxproj
new file mode 100755
index 0000000..8fb5b65
--- /dev/null
+++ b/win32build/VS2010/liblog_rtitest/liblog_rtitest.vcxproj
@@ -0,0 +1,114 @@
+<?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>{0723DEB6-E2C3-4082-91E5-0F8F4B0649F6}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>liblog_rtitest</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>logger_support_test</TargetName>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <LinkIncremental>false</LinkIncremental>
+ <OutDir>$(Configuration)\</OutDir>
+ <TargetName>logger_support_test</TargetName>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>NotUsing</PrecompiledHeader>
+ <WarningLevel>Level4</WarningLevel>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <OutputFile>$(OutDir)logger_support_test$(TargetExt)</OutputFile>
+ <AdditionalDependencies>libutil.lib;liblog.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\libutil\Debug;..\liblog\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy Debug\logger_support_test.exe ..\..\..\src\lib\log\tests</Command>
+ </PostBuildEvent>
+ <PreBuildEvent>
+ <Command>cd ..\..\..\src\lib\log\tests
+copy run_time_init_test.sh.win32 run_time_init_test.sh
+</Command>
+ </PreBuildEvent>
+ </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;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..;..\..\..\src\lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <CompileAs>CompileAsCpp</CompileAs>
+ </ClCompile>
+ <Link>
+ <SubSystem>Console</SubSystem>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ <OptimizeReferences>true</OptimizeReferences>
+ <OutputFile>$(OutDir)logger_support_test$(TargetExt)</OutputFile>
+ <AdditionalDependencies>libutil.lib;liblog.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>..\libutil\Release;..\liblog\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ <PostBuildEvent>
+ <Command>copy Release\logger_support_test.exe ..\..\..\src\lib\log\tests</Command>
+ </PostBuildEvent>
+ <PreBuildEvent>
+ <Command>cd ..\..\..\src\lib\log\tests
+copy run_time_init_test.sh.win32 run_time_init_test.sh
+</Command>
+ </PreBuildEvent>
+ </ItemDefinitionGroup>
+ <ItemGroup>
+ <ClInclude Include="..\..\getopt.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\..\src\lib\log\tests\logger_support_test.cc" />
+ <ClCompile Include="..\..\getopt.cc" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/liblog_rtitest/liblog_rtitest.vcxproj.filters b/win32build/VS2010/liblog_rtitest/liblog_rtitest.vcxproj.filters
new file mode 100755
index 0000000..b4ddd61
--- /dev/null
+++ b/win32build/VS2010/liblog_rtitest/liblog_rtitest.vcxproj.filters
@@ -0,0 +1,30 @@
+<?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>
+ <ClInclude Include="..\..\getopt.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="..\..\getopt.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\log\tests\logger_support_test.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/liblog_rtitest/liblog_rtitest.vcxproj.user b/win32build/VS2010/liblog_rtitest/liblog_rtitest.vcxproj.user
new file mode 100755
index 0000000..695b5c7
--- /dev/null
+++ b/win32build/VS2010/liblog_rtitest/liblog_rtitest.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
More information about the bind10-changes
mailing list