From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 25 Oct 2017 20:53:57 +0000 (+0200)
Subject: [master] Multiple build fixes for kea 1.3 as a result of sanity check.
X-Git-Tag: Kea-1.3.0~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbdbd62a0df920a589081e863c064ebcae74a231;p=thirdparty%2Fkea.git

[master] Multiple build fixes for kea 1.3 as a result of sanity check.
---

diff --git a/src/hooks/dhcp/lease_cmds/Makefile.am b/src/hooks/dhcp/lease_cmds/Makefile.am
index 2c366890d0..90abfdad77 100644
--- a/src/hooks/dhcp/lease_cmds/Makefile.am
+++ b/src/hooks/dhcp/lease_cmds/Makefile.am
@@ -14,8 +14,9 @@ s-messages: lease_cmds_messages.mes
 # (so that they are built before the main library is built).
 BUILT_SOURCES = lease_cmds_messages.h lease_cmds_messages.cc
 
-# Ensure that the message file is included in the distribution
+# Ensure that the message file and doxygen file is included in the distribution
 EXTRA_DIST = lease_cmds_messages.mes
+EXTRA_DIST += lease_cmds.dox
 
 # Get rid of generated message files on a clean
 CLEANFILES = *.gcno *.gcda lease_cmds_messages.h lease_cmds_messages.cc s-messages
diff --git a/src/lib/http/tests/Makefile.am b/src/lib/http/tests/Makefile.am
index d2c8ec3d48..d34853e118 100644
--- a/src/lib/http/tests/Makefile.am
+++ b/src/lib/http/tests/Makefile.am
@@ -23,6 +23,7 @@ TESTS += libhttp_unittests
 libhttp_unittests_SOURCES  = connection_pool_unittests.cc
 libhttp_unittests_SOURCES += date_time_unittests.cc
 libhttp_unittests_SOURCES += listener_unittests.cc
+libhttp_unittests_SOURCES += post_request_unittests.cc
 libhttp_unittests_SOURCES += post_request_json_unittests.cc
 libhttp_unittests_SOURCES += request_parser_unittests.cc
 libhttp_unittests_SOURCES += request_test.h
diff --git a/src/lib/http/tests/post_request_unittests.cc b/src/lib/http/tests/post_request_unittests.cc
index a72d7a3764..26d8746764 100644
--- a/src/lib/http/tests/post_request_unittests.cc
+++ b/src/lib/http/tests/post_request_unittests.cc
@@ -16,20 +16,31 @@ using namespace isc::http::test;
 namespace {
 
 /// @brief Test fixture class for @ref PostHttpRequest.
-typedef HttpRequestTestBase<PostHttpRequest> PostHttpRequestTest;
+class PostHttpRequestTest : public HttpRequestTestBase<PostHttpRequest> {
+public:
+
+    /// @brief Constructor.
+    PostHttpRequestTest()
+        : HttpRequestTestBase<PostHttpRequest>(),
+        json_body_("{ \"service\": \"dhcp4\", \"param1\": \"foo\" }") {
+    }
+
+    /// @brief Default value of the JSON body.
+    std::string json_body_;
+};
 
 // This test verifies that PostHttpRequest class only accepts POST
 // messages.
 TEST_F(PostHttpRequestTest, requirePost) {
     // Use a GET method that is not supported.
-    setContextBasics("GET", "/isc/org", std::make_pair(1, 0));
+    setContextBasics("GET", "/isc/org", HttpVersion(1, 0));
     addHeaderToContext("Content-Length", json_body_.length());
     addHeaderToContext("Content-Type", "application/json");
 
     ASSERT_THROW(request_.create(), HttpRequestError);
 
     // Now use POST. It should be accepted.
-    setContextBasics("POST", "/isc/org", std::make_pair(1, 0));
+    setContextBasics("POST", "/isc/org", HttpVersion(1, 0));
     addHeaderToContext("Content-Length", json_body_.length());
     addHeaderToContext("Content-Type", "application/json");
 
@@ -40,13 +51,13 @@ TEST_F(PostHttpRequestTest, requirePost) {
 // header.
 TEST_F(PostHttpRequestTest, requireContentType) {
     // No "Content-Type". It should fail.
-    setContextBasics("POST", "/isc/org", std::make_pair(1, 0));
+    setContextBasics("POST", "/isc/org", HttpVersion(1, 0));
     addHeaderToContext("Content-Length", json_body_.length());
 
     ASSERT_THROW(request_.create(), HttpRequestError);
 
     // There is "Content-Type". It should pass.
-    setContextBasics("POST", "/isc/org", std::make_pair(1, 0));
+    setContextBasics("POST", "/isc/org", HttpVersion(1, 0));
     addHeaderToContext("Content-Length", json_body_.length());
     addHeaderToContext("Content-Type", "text/html");
 
@@ -58,13 +69,13 @@ TEST_F(PostHttpRequestTest, requireContentType) {
 // header.
 TEST_F(PostHttpRequestTest, requireContentLength) {
     // No "Content-Length". It should fail.
-    setContextBasics("POST", "/isc/org", std::make_pair(1, 0));
+    setContextBasics("POST", "/isc/org", HttpVersion(1, 0));
     addHeaderToContext("Content-Type", "text/html");
 
     ASSERT_THROW(request_.create(), HttpRequestError);
 
     // There is "Content-Length". It should pass.
-    setContextBasics("POST", "/isc/org", std::make_pair(1, 0));
+    setContextBasics("POST", "/isc/org", HttpVersion(1, 0));
     addHeaderToContext("Content-Length", json_body_.length());
     addHeaderToContext("Content-Type", "application/json");
 }
diff --git a/src/share/database/scripts/cql/Makefile.am b/src/share/database/scripts/cql/Makefile.am
index 8a32f195b1..6c3efd69e0 100644
--- a/src/share/database/scripts/cql/Makefile.am
+++ b/src/share/database/scripts/cql/Makefile.am
@@ -3,7 +3,7 @@ SUBDIRS = .
 sqlscriptsdir = ${datarootdir}/${PACKAGE_NAME}/scripts/cql
 sqlscripts_DATA = dhcpdb_create.cql
 sqlscripts_DATA += dhcpdb_drop.cql
+sqlscripts_DATA += soft_wipe.cql
 
-EXTRA_DIST = ${sqlscripts_DATA}
 
-noinst_EXTRA_DIST = soft_wipe.cql
+EXTRA_DIST = ${sqlscripts_DATA}