BIND 10 trac826, updated. b4e7692485b35a7d1564c14b73b4e641123227b0 fix liblog_lltest but locking doesn't work

[BIND 10 source code commits]

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

    fix liblog_lltest but locking doesn't work

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

Summary of changes:
 src/lib/log/tests/logger_lock_test.sh.win32        |    2 +-
 .../VS2008/liblog_lltest/liblog_lltest.vcproj      |    2 ++
 win32build/VS2010/bind10.sln                       |    1 +
 .../VS2010/liblog_lltest/liblog_lltest.vcxproj     |    8 ++++++++
 .../VS2010/liblog_tests/liblog_tests.vcxproj       |    1 +
 5 files changed, 13 insertions(+), 1 deletion(-)

-----------------------------------------------------------------------
diff --git a/src/lib/log/tests/logger_lock_test.sh.win32 b/src/lib/log/tests/logger_lock_test.sh.win32
index ec650b8..45804b8 100755
--- a/src/lib/log/tests/logger_lock_test.sh.win32
+++ b/src/lib/log/tests/logger_lock_test.sh.win32
@@ -37,7 +37,7 @@ LOGGER_LOCK_TEST: UNLOCK
 .
 rm -f $destfile
 B10_LOGGER_SEVERITY=INFO B10_LOGGER_DESTINATION=stdout ./logger_lock_test > $destfile
-cut -d' ' -f3- $destfile | diff $tempfile -
+cut -d' ' -f3- $destfile | diff -b $tempfile -
 passfail $?
 
 # Tidy up.
diff --git a/win32build/VS2008/liblog_lltest/liblog_lltest.vcproj b/win32build/VS2008/liblog_lltest/liblog_lltest.vcproj
index aa2fb0f..23f93d4 100755
--- a/win32build/VS2008/liblog_lltest/liblog_lltest.vcproj
+++ b/win32build/VS2008/liblog_lltest/liblog_lltest.vcproj
@@ -88,6 +88,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy logger_lock_test.sh.win32 logger_lock_test.sh&#x0D;&#x0A;"
 			/>
 		</Configuration>
 		<Configuration
@@ -161,6 +162,7 @@
 			/>
 			<Tool
 				Name="VCPostBuildEventTool"
+				CommandLine="cd ..\..\..\src\lib\log\tests&#x0D;&#x0A;copy logger_lock_test.sh.win32 logger_lock_test.sh&#x0D;&#x0A;"
 			/>
 		</Configuration>
 	</Configurations>
diff --git a/win32build/VS2010/bind10.sln b/win32build/VS2010/bind10.sln
index 2251ec9..2683f99 100755
--- a/win32build/VS2010/bind10.sln
+++ b/win32build/VS2010/bind10.sln
@@ -160,6 +160,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblog_tests", "liblog_test
 	ProjectSection(ProjectDependencies) = postProject
 		{7D04222B-643C-446C-A2B8-93AF74A86246} = {7D04222B-643C-446C-A2B8-93AF74A86246}
 		{8F120666-1A69-4506-8546-0F665E80FFB7} = {8F120666-1A69-4506-8546-0F665E80FFB7}
+		{2E64F6CC-3AD9-4DA7-8E05-ABBB83F9AFC4} = {2E64F6CC-3AD9-4DA7-8E05-ABBB83F9AFC4}
 		{2844FDFB-A0A1-4FA4-A654-15D69CC717DD} = {2844FDFB-A0A1-4FA4-A654-15D69CC717DD}
 		{AEF3DFFE-B566-4E6A-B299-B59B81022C06} = {AEF3DFFE-B566-4E6A-B299-B59B81022C06}
 	EndProjectSection
diff --git a/win32build/VS2010/liblog_lltest/liblog_lltest.vcxproj b/win32build/VS2010/liblog_lltest/liblog_lltest.vcxproj
index f963d28..32dbed0 100755
--- a/win32build/VS2010/liblog_lltest/liblog_lltest.vcxproj
+++ b/win32build/VS2010/liblog_lltest/liblog_lltest.vcxproj
@@ -64,6 +64,10 @@
       <AdditionalLibraryDirectories>..\libexceptions\$(Configuration);..\libutil\$(Configuration);..\liblog\$(Configuration);..\..\..\..\log4cplus\md10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libexceptions.lib;libutil.lib;liblog.lib;log4cplusSD.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>cd ..\..\..\src\lib\log\tests
+copy logger_lock_test.sh.win32 logger_lock_test.sh</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -86,6 +90,10 @@
       <AdditionalLibraryDirectories>..\libexceptions\$(Configuration);..\libutil\$(Configuration);..\liblog\$(Configuration);..\..\..\..\log4cplus\md10\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>libexceptions.lib;libutil.lib;liblog.lib;log4cplusS.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <PostBuildEvent>
+      <Command>cd ..\..\..\src\lib\log\tests
+copy logger_lock_test.sh.win32 logger_lock_test.sh</Command>
+    </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\src\lib\log\tests\logger_lock_test.cc" />
diff --git a/win32build/VS2010/liblog_tests/liblog_tests.vcxproj b/win32build/VS2010/liblog_tests/liblog_tests.vcxproj
index 4956b3f..35cf25e 100755
--- a/win32build/VS2010/liblog_tests/liblog_tests.vcxproj
+++ b/win32build/VS2010/liblog_tests/liblog_tests.vcxproj
@@ -88,6 +88,7 @@
     <PreBuildEvent>
       <Command>cd ..\..\..\src\lib\log\tests
 copy tempdir.h.win32 tempdir.h
+..\..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe log_test_messages.mes
 </Command>
     </PreBuildEvent>
   </ItemDefinitionGroup>