]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[3797] Use TEST_DATA_BUILDDIR for unit tests
authorThomas Markwalder <tmark@isc.org>
Fri, 19 Jun 2015 15:17:03 +0000 (11:17 -0400)
committerThomas Markwalder <tmark@isc.org>
Fri, 19 Jun 2015 15:17:03 +0000 (11:17 -0400)
Replaced use of TEST_DATA_DIR with TEST_DATA_BUILDDIR for socket_path
and fixed cast of close.

src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc

index bf0a95f49ad853e3c9d28bfa3b65fd6d5de53c5a..dfca08e832f30907ebb5092e67b0789da73111e1 100644 (file)
@@ -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();
     }