From: Tomek Mrugalski <tomasz@isc.org>
Date: Tue, 31 May 2016 18:26:46 +0000 (+0200)
Subject: [github21] Compilation fixes for Cassandra unit-tests.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1993809acfa9e22af45db72b0f614c35116c2132;p=thirdparty%2Fkea.git

[github21] Compilation fixes for Cassandra unit-tests.
---

diff --git a/src/lib/dhcpsrv/tests/dscsql_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/dscsql_lease_mgr_unittest.cc
index e35f7c0e4e..48071575d0 100644
--- a/src/lib/dhcpsrv/tests/dscsql_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/dscsql_lease_mgr_unittest.cc
@@ -81,7 +81,7 @@ public:
     /// the same database.
     void reopen(Universe) {
         LeaseMgrFactory::destroy();
-        LeaseMgrFactory::create(validConnectionString());
+        LeaseMgrFactory::create(validDSCSQLConnectionString());
         lmptr_ = &(LeaseMgrFactory::instance());
     }
 
@@ -185,8 +185,8 @@ TEST_F(DSCSqlLeaseMgrTest, checkVersion) {
     // Check version
     pair<uint32_t, uint32_t> version;
     ASSERT_NO_THROW(version = lmptr_->getVersion());
-    EXPECT_EQ(CURRENT_VERSION_VERSION, version.first);
-    EXPECT_EQ(CURRENT_VERSION_MINOR, version.second);
+    EXPECT_EQ(DSCSQL_CURRENT_VERSION, version.first);
+    EXPECT_EQ(DSCSQL_CURRENT_MINOR, version.second);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/lib/dhcpsrv/testutils/Makefile.am b/src/lib/dhcpsrv/testutils/Makefile.am
index f058c553a7..500ce75a75 100644
--- a/src/lib/dhcpsrv/testutils/Makefile.am
+++ b/src/lib/dhcpsrv/testutils/Makefile.am
@@ -19,9 +19,18 @@ libdhcpsrvtest_la_SOURCES += schema.cc schema.h
 else
 if HAVE_PGSQL
 libdhcpsrvtest_la_SOURCES += schema.cc schema.h
+else
+if HAVE_DSCSQL
+libdhcpsrvtest_la_SOURCES += schema.cc schema.h
+endif
 endif
 endif
 
+if HAVE_DSCSQL
+libdhcpsrvtest_la_SOURCES += dscsql_schema.cc dscsql_schema.h
+endif
+
+
 if HAVE_MYSQL
 libdhcpsrvtest_la_SOURCES += mysql_schema.cc mysql_schema.h
 endif
@@ -38,6 +47,11 @@ if HAVE_PGSQL
 libdhcpsrvtest_la_CPPFLAGS += $(PGSQL_CPPFLAGS)
 endif
 
+if HAVE_DSCSQL
+libdhcpsrvtest_la_CPPFLAGS += $(DSCSQL_CPPFLAGS)
+endif
+
+
 libdhcpsrvtest_la_LDFLAGS  = $(AM_LDFLAGS)
 if HAVE_MYSQL
 libdhcpsrvtest_la_LDFLAGS  += $(MYSQL_LIBS)
@@ -46,6 +60,10 @@ if HAVE_PGSQL
 libdhcpsrvtest_la_LDFLAGS  += $(PGSQL_LIBS)
 endif
 
+if HAVE_DSCSQL
+libdhcpsrvtest_la_LDFLAGS  += $(DSCSQL_LIBS)
+endif
+
 libdhcpsrvtest_la_LIBADD   = $(top_builddir)/src/lib/cc/libkea-cc.la
 libdhcpsrvtest_la_LIBADD  += $(top_builddir)/src/lib/log/libkea-log.la