From: Thomas Markwalder <tmark@isc.org>
Date: Fri, 19 Jun 2015 15:17:03 +0000 (-0400)
Subject: [3797] Use TEST_DATA_BUILDDIR for unit tests
X-Git-Tag: trac3910_base~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=79df1b2a03e3baf9ec0c3bddba921912ea9aed40;p=thirdparty%2Fkea.git

[3797] Use TEST_DATA_BUILDDIR for unit tests

Replaced use of TEST_DATA_DIR with TEST_DATA_BUILDDIR for socket_path
and fixed cast of close.
---

diff --git a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
index bf0a95f49a..dfca08e832 100644
--- a/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc
@@ -54,7 +54,7 @@ public:
     /// @brief Closes the Control Channel socket
     void disconnectFromServer() {
         if (socket_fd_ >= 0) {
-            (void)(close(socket_fd_));
+            static_cast<void>(close(socket_fd_));
             socket_fd_ = -1;
         }
     }
@@ -223,7 +223,7 @@ public:
     boost::shared_ptr<NakedControlledDhcpv6Srv> server_;
 
     CtrlChannelDhcpv6SrvTest() {
-        socket_path_ = string(TEST_DATA_DIR) + "/kea6.sock";
+        socket_path_ = string(TEST_DATA_BUILDDIR) + "/kea6.sock";
         reset();
     }