BIND 10 trac826, updated. b0ced0748d16421e6215998edd214455f48d87d7 [trac826] fix datasrc tests

[BIND 10 source code commits]

The branch, trac826 has been updated
       via  b0ced0748d16421e6215998edd214455f48d87d7 (commit)
      from  6cc92fea3f93aa21595757e203c627572e36d294 (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 b0ced0748d16421e6215998edd214455f48d87d7
Author: Francis Dupont <fdupont at isc.org>
Date:   Sun Oct 16 03:49:11 2011 +0200

    [trac826] fix datasrc tests

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

Summary of changes:
 src/lib/datasrc/factory.cc                         |    4 ++--
 src/lib/datasrc/tests/sqlite3_accessor_unittest.cc |   14 ++++++++++++++
 .../libdatasrc_tests/libdatasrc_tests.vcxproj      |   10 ++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/factory.cc b/src/lib/datasrc/factory.cc
index df573b9..8a87a0f 100644
--- a/src/lib/datasrc/factory.cc
+++ b/src/lib/datasrc/factory.cc
@@ -33,9 +33,9 @@ namespace datasrc {
 
 LibraryContainer::LibraryContainer(const std::string& name) {
 #ifdef _WIN32
-    if (strcmp(name.c_str(), "sqlite3") == 0)
+    if (strcmp(name.c_str(), "sqlite3_ds.so") == 0)
         ds_lib_ = 1;
-    else if (strcmp(name.c_str(), "memory") == 0)
+    else if (strcmp(name.c_str(), "memory_ds.so") == 0)
         ds_lib_ = 2;
     else {
         isc_throw(DataSourceLibraryError,
diff --git a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
index 11588f7..d2c7034 100644
--- a/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_accessor_unittest.cc
@@ -500,9 +500,23 @@ protected:
     SQLite3Update() {
         // Note: if "installing" the test file fails some of the subsequent
         // tests would fail.
+#ifdef _WIN32
+        const char *install_pcmd = INSTALL_PROG " " TEST_DATA_DIR
+                                   "/test.sqlite3 " TEST_DATA_BUILDDIR
+                                   "/test.sqlite3.copied";
+        char install_cmd[1024];
+        for (unsigned int i = 0;; i++) {
+          install_cmd[i] = install_pcmd[i];
+            if (install_cmd[i] == '/')
+                install_cmd[i] = '\\';
+            if (install_cmd[i] == 0)
+                break;
+        }
+#else
         const char *install_cmd = INSTALL_PROG " " TEST_DATA_DIR
                                   "/test.sqlite3 " TEST_DATA_BUILDDIR
                                   "/test.sqlite3.copied";
+#endif
         if (system(install_cmd) != 0) {
             // any exception will do, this is failure in test setup, but nice
             // to show the command that fails, and shouldn't be caught
diff --git a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
index 0a49f23..6a1e878 100755
--- a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
+++ b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
@@ -63,6 +63,11 @@
       <AdditionalDependencies>libexceptions.lib;libutil.lib;libutil_unittests.lib;liblog.lib;libcryptolink.lib;libdns++.lib;libcc.lib;libtestutils.lib;libdatasrc.lib;botan.lib;log4cplusSD.lib;gtestd.lib;sqlite3.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\libexceptions\$(Configuration);..\libutil\$(Configuration);..\libutil_unittests\$(Configuration);..\liblog\$(Configuration);..\libcryptolink\$(Configuration);..\libdns++\$(Configuration);..\libcc\$(Configuration);..\libtestutils\$(Configuration);..\libdatasrc\$(Configuration);..\..\..\..\botan\md10\$(Configuration);..\..\..\..\log4cplus\md10\$(Configuration);..\..\..\..\gtest\md10\$(Configuration);C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PreBuildEvent>
+      <Command>..\..\..\src\lib\datasrc\tests\testdata
+copy rwtest.sqlite3 rwtest.sqlite3.copied
+</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
@@ -84,6 +89,11 @@
       <AdditionalDependencies>libexceptions.lib;libutil.lib;libutil_unittests.lib;liblog.lib;libcryptolink.lib;libdns++.lib;libcc.lib;libtestutils.lib;libdatasrc.lib;botan.lib;log4cplusS.lib;gtest.lib;sqlite3.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\libexceptions\$(Configuration);..\libutil\$(Configuration);..\libutil_unittests\$(Configuration);..\liblog\$(Configuration);..\libcryptolink\$(Configuration);..\libdns++\$(Configuration);..\libcc\$(Configuration);..\libtestutils\$(Configuration);..\libdatasrc\$(Configuration);..\..\..\..\botan\md10\$(Configuration);..\..\..\..\log4cplus\md10\$(Configuration);..\..\..\..\gtest\md10\$(Configuration);C:\sqlite3;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
+    <PreBuildEvent>
+      <Command>..\..\..\src\lib\datasrc\tests\testdata
+copy rwtest.sqlite3 rwtest.sqlite3.copied
+</Command>
+    </PreBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\src\lib\datasrc\tests\test_datasrc.h" />