BIND 10 trac826, updated. 44b16960024565548b7a214ad973f844b35f7832 lib datasrc try 2 (compiles but not tested)
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Jun 29 22:46:51 UTC 2012
The branch, trac826 has been updated
via 44b16960024565548b7a214ad973f844b35f7832 (commit)
from 71ae6fae84ff35239024b745aec812b679183964 (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 44b16960024565548b7a214ad973f844b35f7832
Author: Francis Dupont <fdupont at isc.org>
Date: Sat Jun 30 00:46:26 2012 +0200
lib datasrc try 2 (compiles but not tested)
-----------------------------------------------------------------------
Summary of changes:
src/lib/datasrc/static_datasrc_link.cc | 2 +-
src/lib/datasrc/tests/client_list_unittest.cc | 28 +++++++--------
src/lib/datasrc/tests/database_unittest.cc | 10 +++---
src/lib/datasrc/tests/factory_unittest.cc | 4 ++-
src/lib/datasrc/tests/memory_datasrc_unittest.cc | 6 ++--
src/lib/datasrc/tests/test_client.cc | 9 ++---
.../datasrc/tests/zone_finder_context_unittest.cc | 6 ++--
src/lib/datasrc/tests/zonetable_unittest.cc | 5 +++
win32build/VS2008/libdatasrc/libdatasrc.vcproj | 36 ++++++++++++++++++--
.../libdatasrc_tests/libdatasrc_tests.vcproj | 36 +++++++++++++++++---
win32build/VS2010/libdatasrc/libdatasrc.vcxproj | 12 +++++++
.../VS2010/libdatasrc/libdatasrc.vcxproj.filters | 24 +++++++++++++
.../libdatasrc_tests/libdatasrc_tests.vcxproj | 21 +++++++-----
.../libdatasrc_tests.vcxproj.filters | 21 ++++++++++++
14 files changed, 177 insertions(+), 43 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/static_datasrc_link.cc b/src/lib/datasrc/static_datasrc_link.cc
index 789580d..f2676c6 100644
--- a/src/lib/datasrc/static_datasrc_link.cc
+++ b/src/lib/datasrc/static_datasrc_link.cc
@@ -35,7 +35,7 @@ createInstance(ConstElementPtr config, string& error) {
// Create the data source
auto_ptr<InMemoryClient> client(new InMemoryClient());
// Hardcode the origin and class
- shared_ptr<InMemoryZoneFinder>
+ boost::shared_ptr<InMemoryZoneFinder>
finder(new InMemoryZoneFinder(RRClass::CH(), Name("BIND")));
// Fill it with data
const string path(config->stringValue());
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index ae22470..e44c378 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -43,14 +43,14 @@ public:
RRClass getClass() const {
isc_throw(isc::NotImplemented, "Not implemented");
}
- shared_ptr<Context> find(const Name&, const RRType&,
- const FindOptions)
+ boost::shared_ptr<Context> find(const Name&, const RRType&,
+ const FindOptions)
{
isc_throw(isc::NotImplemented, "Not implemented");
}
- shared_ptr<Context> findAll(const Name&,
- vector<ConstRRsetPtr>&,
- const FindOptions)
+ boost::shared_ptr<Context> findAll(const Name&,
+ vector<ConstRRsetPtr>&,
+ const FindOptions)
{
isc_throw(isc::NotImplemented, "Not implemented");
}
@@ -62,7 +62,7 @@ public:
};
// Constructor from a list of zones.
MockDataSourceClient(const char* zone_names[]) {
- for (const char** zone(zone_names); *zone; ++zone) {
+ for (const char** zone = zone_names; *zone; ++zone) {
zones.insert(Name(*zone));
}
}
@@ -125,7 +125,7 @@ public:
if (type == "error") {
isc_throw(DataSourceError, "The error data source type");
}
- shared_ptr<MockDataSourceClient>
+ boost::shared_ptr<MockDataSourceClient>
ds(new MockDataSourceClient(type, configuration));
// Make sure it is deleted when the test list is deleted.
to_delete_.push_back(ds);
@@ -134,7 +134,7 @@ public:
private:
// Hold list of data sources created internally, so they are preserved
// until the end of the test and then deleted.
- vector<shared_ptr<MockDataSourceClient> > to_delete_;
+ vector<boost::shared_ptr<MockDataSourceClient> > to_delete_;
};
const char* ds_zones[][3] = {
@@ -171,7 +171,7 @@ public:
"}]"))
{
for (size_t i(0); i < ds_count; ++ i) {
- shared_ptr<MockDataSourceClient>
+ boost::shared_ptr<MockDataSourceClient>
ds(new MockDataSourceClient(ds_zones[i]));
ds_.push_back(ds);
ds_info_.push_back(ConfigurableClientList::DataSourceInfo(ds.get(),
@@ -180,7 +180,7 @@ public:
}
// Check the positive result is as we expect it.
void positiveResult(const ClientList::FindResult& result,
- const shared_ptr<MockDataSourceClient>& dsrc,
+ const boost::shared_ptr<MockDataSourceClient>& dsrc,
const Name& name, bool exact,
const char* test)
{
@@ -231,9 +231,9 @@ public:
EXPECT_EQ(type, ds->type_);
EXPECT_TRUE(Element::fromJSON(params)->equals(*ds->configuration_));
}
- shared_ptr<TestedList> list_;
+ boost::shared_ptr<TestedList> list_;
const ClientList::FindResult negativeResult_;
- vector<shared_ptr<MockDataSourceClient> > ds_;
+ vector<boost::shared_ptr<MockDataSourceClient> > ds_;
vector<ConfigurableClientList::DataSourceInfo> ds_info_;
const ConstElementPtr config_elem_;
};
@@ -386,7 +386,7 @@ TEST_F(ListTest, configureParams) {
"{}",
NULL
};
- for (const char** param(params); *param; ++param) {
+ for (const char** param = params; *param; ++param) {
SCOPED_TRACE(*param);
ConstElementPtr elem(Element::fromJSON(string("["
"{"
@@ -424,7 +424,7 @@ TEST_F(ListTest, wrongConfig) {
// Put something inside to see it survives the exception
list_->configure(*config_elem_, true);
checkDS(0, "test_type", "{}");
- for (const char** config(configs); *config; ++config) {
+ for (const char** config = configs; *config; ++config) {
SCOPED_TRACE(*config);
ConstElementPtr elem(Element::fromJSON(*config));
EXPECT_THROW(list_->configure(*elem, true),
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index f0a3fe5..a118c26 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -1498,7 +1498,8 @@ TYPED_TEST(DatabaseClientTest, iterator) {
ASSERT_NE(ConstRRsetPtr(), rrset);
// The first name should be the zone origin.
- EXPECT_EQ(this->zname_, rrset->getName());
+ const Name origin = this->zname_;
+ EXPECT_EQ(origin, rrset->getName());
}
// Supplemental structure used in the couple of tests below. It represents
@@ -1816,8 +1817,8 @@ TEST_F(MockDatabaseClientTest, ttldiff_separate_rrs) {
// Walk through the full iterator, we should see 1 rrset with name
// ttldiff1.example.org., and two rdatas. Same for ttldiff2
Name name("ttldiff.example.org.");
- int found1 = false;
- int found2 = false;
+ bool found1 = false;
+ bool found2 = false;
ConstRRsetPtr rrset = it->getNextRRset();
while(rrset != ConstRRsetPtr()) {
if (rrset->getName() == name) {
@@ -2946,7 +2947,8 @@ TYPED_TEST(DatabaseClientTest, getOrigin) {
if (this->is_mock_) {
EXPECT_EQ(READONLY_ZONE_ID, finder->zone_id());
}
- EXPECT_EQ(this->zname_, finder->getOrigin());
+ const Name origin = this->zname_;
+ EXPECT_EQ(origin, finder->getOrigin());
}
TYPED_TEST(DatabaseClientTest, updaterFinder) {
diff --git a/src/lib/datasrc/tests/factory_unittest.cc b/src/lib/datasrc/tests/factory_unittest.cc
index 2031d50..3dd7f1a 100644
--- a/src/lib/datasrc/tests/factory_unittest.cc
+++ b/src/lib/datasrc/tests/factory_unittest.cc
@@ -48,6 +48,7 @@ pathtestHelper(const std::string& file, const std::string& expected_error) {
EXPECT_EQ(expected_error, error.substr(0, expected_error.size()));
}
+#ifndef _WIN32
TEST(FactoryTest, paths) {
// Test whether the paths are made absolute if they are not,
// by inspecting the error that is raised when they are wrong
@@ -96,6 +97,7 @@ TEST(FactoryTest, paths) {
ASSERT_THROW(DataSourceClientContainer(".so", ElementPtr()),
DataSourceLibraryError);
}
+#endif
TEST(FactoryTest, sqlite3ClientBadConfig) {
// We start out by building the configuration data bit by bit,
@@ -283,7 +285,7 @@ TEST(FactoryTest, staticDSBadConfig) {
"true",
NULL
};
- for (const char** config(configs); *config; ++config) {
+ for (const char** config = configs; *config; ++config) {
SCOPED_TRACE(*config);
EXPECT_THROW(DataSourceClientContainer("static",
Element::fromJSON(*config)),
diff --git a/src/lib/datasrc/tests/memory_datasrc_unittest.cc b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
index 6a05508..a9faf28 100644
--- a/src/lib/datasrc/tests/memory_datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/memory_datasrc_unittest.cc
@@ -1258,8 +1258,10 @@ TEST_F(InMemoryZoneFinderTest, loadFromIterator) {
const char* const a_sig_txt = "ns1.example.org. 300 IN RRSIG A 5 3 300 "
"20000101000000 20000201000000 12345 example.org. FAKEFAKE\n";
ss << soa_txt << soa_sig_txt << a_txt << a_sig_txt;
- shared_ptr<DataSourceClient> db_client = unittest::createSQLite3Client(
- class_, origin_, TEST_DATA_BUILDDIR "/contexttest.sqlite3.copied", ss);
+ boost::shared_ptr<DataSourceClient>
+ db_client = unittest::createSQLite3Client(
+ class_, origin_,
+ TEST_DATA_BUILDDIR "/contexttest.sqlite3.copied", ss);
zone_finder_.load(*db_client->getIterator(origin_));
// The new content should be visible, including the previously-nonexistent
diff --git a/src/lib/datasrc/tests/test_client.cc b/src/lib/datasrc/tests/test_client.cc
index 81aa175..13fe106 100644
--- a/src/lib/datasrc/tests/test_client.cc
+++ b/src/lib/datasrc/tests/test_client.cc
@@ -48,7 +48,7 @@ addRRset(ZoneUpdaterPtr updater, ConstRRsetPtr rrset) {
}
}
-shared_ptr<DataSourceClient>
+boost::shared_ptr<DataSourceClient>
createSQLite3Client(RRClass zclass, const Name& zname,
const char* const db_file, const char* const zone_file)
{
@@ -60,7 +60,7 @@ createSQLite3Client(RRClass zclass, const Name& zname,
return (createSQLite3Client(zclass, zname, db_file, ifs));
}
-shared_ptr<DataSourceClient>
+boost::shared_ptr<DataSourceClient>
createSQLite3Client(RRClass zclass, const Name& zname,
const char* const db_file, istream& rr_stream)
{
@@ -88,9 +88,10 @@ createSQLite3Client(RRClass zclass, const Name& zname,
"Error setting up; command failed: " << install_cmd);
}
- shared_ptr<SQLite3Accessor> accessor(
+ boost::shared_ptr<SQLite3Accessor> accessor(
new SQLite3Accessor(db_file, zclass.toText()));
- shared_ptr<DatabaseClient> client(new DatabaseClient(zclass, accessor));
+ boost::shared_ptr<DatabaseClient> client(
+ new DatabaseClient(zclass, accessor));
ZoneUpdaterPtr updater = client->getUpdater(zname, true);
masterLoad(rr_stream, zname, zclass, boost::bind(addRRset, updater, _1));
diff --git a/src/lib/datasrc/tests/zone_finder_context_unittest.cc b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
index 50d409e..66a5cc7 100644
--- a/src/lib/datasrc/tests/zone_finder_context_unittest.cc
+++ b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
@@ -49,7 +49,7 @@ namespace {
const char* const TEST_ZONE_FILE = TEST_DATA_DIR "/contexttest.zone";
// Convenient shortcut
-typedef shared_ptr<DataSourceClient> DataSourceClientPtr;
+typedef boost::shared_ptr<DataSourceClient> DataSourceClientPtr;
// This is the type used as the test parameter. Note that this is
// intentionally a plain old type (i.e. a function pointer), not a class;
@@ -59,9 +59,9 @@ typedef DataSourceClientPtr (*ClientCreator)(RRClass, const Name&);
// Creator for the in-memory client to be tested
DataSourceClientPtr
createInMemoryClient(RRClass zclass, const Name& zname) {
- shared_ptr<InMemoryClient> client(new InMemoryClient);
+ boost::shared_ptr<InMemoryClient> client(new InMemoryClient);
- shared_ptr<InMemoryZoneFinder> finder(
+ boost::shared_ptr<InMemoryZoneFinder> finder(
new InMemoryZoneFinder(zclass, zname));
finder->load(TEST_ZONE_FILE);
diff --git a/src/lib/datasrc/tests/zonetable_unittest.cc b/src/lib/datasrc/tests/zonetable_unittest.cc
index fa74c0e..5c7837e 100644
--- a/src/lib/datasrc/tests/zonetable_unittest.cc
+++ b/src/lib/datasrc/tests/zonetable_unittest.cc
@@ -39,8 +39,13 @@ TEST(ZoneTest, init) {
TEST(ZoneTest, find) {
InMemoryZoneFinder zone(RRClass::IN(), Name("example.com"));
+#ifdef _MSC_VER
+ EXPECT_EQ(ZoneFinder::NXDOMAIN,
+ zone.find(Name("www.example.com"), RRType::A())->code);
+#else
EXPECT_EQ(ZoneFinder::NXDOMAIN,
zone.find(Name("www.example.com"), RRType::A()).code);
+#endif
}
class ZoneTableTest : public ::testing::Test {
diff --git a/win32build/VS2008/libdatasrc/libdatasrc.vcproj b/win32build/VS2008/libdatasrc/libdatasrc.vcproj
index 7a03474..91b4181 100755
--- a/win32build/VS2008/libdatasrc/libdatasrc.vcproj
+++ b/win32build/VS2008/libdatasrc/libdatasrc.vcproj
@@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\..\src\lib\datasrc
..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe datasrc_messages.mes
"
+ CommandLine="cd ..\..\..\src\lib\datasrc
..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe datasrc_messages.mes
copy datasrc_config.h.pre.win32 datasrc_config.h
copy static.zone.pre static.zone

"
/>
<Tool
Name="VCCustomBuildTool"
@@ -89,7 +89,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\..\src\lib\datasrc
..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe datasrc_messages.mes
"
+ CommandLine="cd ..\..\..\src\lib\datasrc
..\..\..\win32build\VS2008\liblog_compiler\$(ConfigurationName)\message.exe datasrc_messages.mes
copy datasrc_config.h.pre.win32 datasrc_config.h
copy static.zone.pre static.zone

"
/>
<Tool
Name="VCCustomBuildTool"
@@ -157,6 +157,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\client_list.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\data_source.cc"
>
</File>
@@ -181,6 +185,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\memory_datasrc_link.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\query.cc"
>
</File>
@@ -189,6 +197,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\sqlite3_accessor_link.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\sqlite3_datasrc.cc"
>
</File>
@@ -197,6 +209,14 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\static_datasrc_link.cc"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\datasrc\zone_finder_context.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\zonetable.cc"
>
</File>
@@ -215,6 +235,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\client_list.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\data_source.h"
>
</File>
@@ -223,6 +247,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\datasrc_config.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\datasrc_messages.h"
>
</File>
@@ -247,6 +275,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\rbnode_rrset.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\rbtree.h"
>
</File>
diff --git a/win32build/VS2008/libdatasrc_tests/libdatasrc_tests.vcproj b/win32build/VS2008/libdatasrc_tests/libdatasrc_tests.vcproj
index 9917151..766020b 100755
--- a/win32build/VS2008/libdatasrc_tests/libdatasrc_tests.vcproj
+++ b/win32build/VS2008/libdatasrc_tests/libdatasrc_tests.vcproj
@@ -25,7 +25,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\..\src\lib\datasrc\tests\testdata
copy rwtest.sqlite3 rwtest.sqlite3.copied
"
+ CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@@ -43,7 +43,7 @@
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;"$(BOOST)";C:\sqlite3"
- PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\""
+ PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\";TEST_DATA_COMMONDIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\""
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
@@ -103,7 +103,7 @@
>
<Tool
Name="VCPreBuildEventTool"
- CommandLine="cd ..\..\..\src\lib\datasrc\tests\testdata
copy rwtest.sqlite3 rwtest.sqlite3.copied
"
+ CommandLine=""
/>
<Tool
Name="VCCustomBuildTool"
@@ -122,7 +122,7 @@
Optimization="2"
EnableIntrinsicFunctions="true"
AdditionalIncludeDirectories="..;..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;"$(BOOST)";C:\sqlite3"
- PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\""
+ PreprocessorDefinitions="TEST_DATA_DIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\";TEST_DATA_BUILDDIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\";TEST_DATA_COMMONDIR=\"$(BIND10HOME)/src/lib/datasrc/tests/testdata\""
RuntimeLibrary="2"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
@@ -187,6 +187,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\tests\client_list_unittest.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\tests\client_unittest.cc"
>
</File>
@@ -203,6 +207,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\tests\faked_nsec3.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\tests\logger_unittest.cc"
>
</File>
@@ -215,6 +223,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\tests\rbnode_rrset_unittest.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\tests\rbtree_unittest.cc"
>
</File>
@@ -235,6 +247,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\tests\test_client.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\tests\test_datasrc.cc"
>
</File>
@@ -243,6 +259,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\lib\datasrc\tests\zone_finder_context_unittest.cc"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\tests\zonetable_unittest.cc"
>
</File>
@@ -253,6 +273,14 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
+ RelativePath="..\..\..\src\lib\datasrc\tests\faked_nsec3.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\src\lib\datasrc\tests\test_client.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\lib\datasrc\tests\test_datasrc.h"
>
</File>
diff --git a/win32build/VS2010/libdatasrc/libdatasrc.vcxproj b/win32build/VS2010/libdatasrc/libdatasrc.vcxproj
index 15f0bb1..c8c0841 100755
--- a/win32build/VS2010/libdatasrc/libdatasrc.vcxproj
+++ b/win32build/VS2010/libdatasrc/libdatasrc.vcxproj
@@ -13,7 +13,9 @@
<ItemGroup>
<ClInclude Include="..\..\..\src\lib\datasrc\cache.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\client.h" />
+ <ClInclude Include="..\..\..\src\lib\datasrc\client_list.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\database.h" />
+ <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_config.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\datasrc_messages.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\data_source.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\factory.h" />
@@ -21,6 +23,7 @@
<ClInclude Include="..\..\..\src\lib\datasrc\logger.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\memory_datasrc.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\query.h" />
+ <ClInclude Include="..\..\..\src\lib\datasrc\rbnode_rrset.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\rbtree.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\result.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_accessor.h" />
@@ -31,17 +34,22 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\lib\datasrc\cache.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\client_list.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\database.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\datasrc_messages.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\data_source.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\factory.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\logger.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc_link.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\query.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_accessor.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_accessor_link.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_datasrc.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\static_datasrc.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\static_datasrc_link.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\zonetable.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\zone_finder_context.cc" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{32624520-5341-471B-B88D-2599DBCDABF5}</ProjectGuid>
@@ -92,6 +100,8 @@
<PreBuildEvent>
<Command>cd ..\..\..\src\lib\datasrc
..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe datasrc_messages.mes
+copy datasrc_config.h.pre.win32 datasrc_config.h
+copy static.zone.pre static.zone
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
@@ -115,6 +125,8 @@
<PreBuildEvent>
<Command>cd ..\..\..\src\lib\datasrc
..\..\..\win32build\VS2010\liblog_compiler\$(Configuration)\message.exe datasrc_messages.mes
+copy datasrc_config.h.pre.win32 datasrc_config.h
+copy static.zone.pre static.zone
</Command>
</PreBuildEvent>
</ItemDefinitionGroup>
diff --git a/win32build/VS2010/libdatasrc/libdatasrc.vcxproj.filters b/win32build/VS2010/libdatasrc/libdatasrc.vcxproj.filters
index 5ada443..6ff5011 100755
--- a/win32build/VS2010/libdatasrc/libdatasrc.vcxproj.filters
+++ b/win32build/VS2010/libdatasrc/libdatasrc.vcxproj.filters
@@ -66,6 +66,15 @@
<ClInclude Include="..\..\..\src\lib\datasrc\sqlite3_accessor.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\lib\datasrc\client_list.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\lib\datasrc\rbnode_rrset.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\lib\datasrc\datasrc_config.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\lib\datasrc\cache.cc">
@@ -104,5 +113,20 @@
<ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_accessor.cc">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\client_list.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\memory_datasrc_link.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\sqlite3_accessor_link.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\static_datasrc_link.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\zone_finder_context.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
index ad1fb2e..f58155c 100755
--- a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
+++ b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj
@@ -52,7 +52,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_COMMONDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;%BOOST%;C:\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -64,9 +64,8 @@
<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>cd ..\..\..\src\lib\datasrc\tests\testdata
-copy rwtest.sqlite3 rwtest.sqlite3.copied
-</Command>
+ <Command>
+ </Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -76,7 +75,7 @@ copy rwtest.sqlite3 rwtest.sqlite3.copied
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;TEST_DATA_DIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_BUILDDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";TEST_DATA_COMMONDIR="%BIND10HOME%/src/lib/datasrc/tests/testdata";NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..;..\..\..\src\lib;..\..\..\src\lib\dns;..\..\..\..\gtest\include;%BOOST%;C:\sqlite3;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAs>CompileAsCpp</CompileAs>
</ClCompile>
@@ -90,31 +89,37 @@ copy rwtest.sqlite3 rwtest.sqlite3.copied
<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>cd ..\..\..\src\lib\datasrc\tests\testdata
-copy rwtest.sqlite3 rwtest.sqlite3.copied
-</Command>
+ <Command>
+ </Command>
</PreBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
+ <ClInclude Include="..\..\..\src\lib\datasrc\tests\faked_nsec3.h" />
+ <ClInclude Include="..\..\..\src\lib\datasrc\tests\test_client.h" />
<ClInclude Include="..\..\..\src\lib\datasrc\tests\test_datasrc.h" />
<ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\lib\datasrc\tests\cache_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\client_list_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\client_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\database_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\datasrc_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\factory_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\faked_nsec3.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\logger_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\memory_datasrc_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\query_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\rbnode_rrset_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\rbtree_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\run_unittests.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\sqlite3_accessor_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\sqlite3_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\static_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\test_client.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\test_datasrc.cc" />
<ClCompile Include="..\..\..\src\lib\datasrc\tests\zonetable_unittest.cc" />
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\zone_finder_context_unittest.cc" />
<ClCompile Include="..\..\..\src\lib\dns\tests\unittest_util.cc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj.filters b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj.filters
index d774595..e5345e3 100755
--- a/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj.filters
+++ b/win32build/VS2010/libdatasrc_tests/libdatasrc_tests.vcxproj.filters
@@ -21,6 +21,12 @@
<ClInclude Include="..\..\..\src\lib\dns\tests\unittest_util.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\src\lib\datasrc\tests\faked_nsec3.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\src\lib\datasrc\tests\test_client.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\src\lib\datasrc\tests\cache_unittest.cc">
@@ -71,5 +77,20 @@
<ClCompile Include="..\..\..\src\lib\datasrc\tests\factory_unittest.cc">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\client_list_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\faked_nsec3.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\rbnode_rrset_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\zone_finder_context_unittest.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\src\lib\datasrc\tests\test_client.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
More information about the bind10-changes
mailing list