[github36] lease_file_io.cc|h moved.

diff --git a/src/lib/dhcpsrv/tests/Makefile.am b/src/lib/dhcpsrv/tests/Makefile.am
index 83a178a0d33a9443fe6caacd4f78643919189851..09858d7ea00ad3036c3a15e2259fb8d4b0efc681 100644 (file)
--- a/src/lib/dhcpsrv/tests/Makefile.am
+++ b/src/lib/dhcpsrv/tests/Makefile.am
@@ -96,7 +96,6 @@ libdhcpsrv_unittests_SOURCES += host_unittest.cc
 libdhcpsrv_unittests_SOURCES += host_reservation_parser_unittest.cc
 libdhcpsrv_unittests_SOURCES += host_reservations_list_parser_unittest.cc
 libdhcpsrv_unittests_SOURCES += ifaces_config_parser_unittest.cc
-libdhcpsrv_unittests_SOURCES += lease_file_io.cc lease_file_io.h
 libdhcpsrv_unittests_SOURCES += lease_file_loader_unittest.cc
 libdhcpsrv_unittests_SOURCES += lease_unittest.cc
 libdhcpsrv_unittests_SOURCES += lease_mgr_factory_unittest.cc

diff --git a/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc b/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
index a9ccfe189ee728d27dfa26b0d4ee5f5ad5da86e7..f3566393a7926b6fbdbf27d476775be11e7cf929 100644 (file)
--- a/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
+++ b/src/lib/dhcpsrv/tests/csv_lease_file4_unittest.cc
@@ -9,7 +9,7 @@
 #include <dhcp/duid.h>
 #include <dhcpsrv/csv_lease_file4.h>
 #include <dhcpsrv/lease.h>
-#include <dhcpsrv/tests/lease_file_io.h>
+#include <dhcpsrv/testutils/lease_file_io.h>
 #include <gtest/gtest.h>
 #include <sstream>
 

diff --git a/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc b/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
index a2533fd972f01a6f06c6741ad85d0e644e44d6f7..38a968d9322b707b1619de010cc1844923ba67fb 100644 (file)
--- a/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
+++ b/src/lib/dhcpsrv/tests/csv_lease_file6_unittest.cc
@@ -9,7 +9,7 @@
 #include <dhcp/duid.h>
 #include <dhcpsrv/csv_lease_file6.h>
 #include <dhcpsrv/lease.h>
-#include <dhcpsrv/tests/lease_file_io.h>
+#include <dhcpsrv/testutils/lease_file_io.h>
 #include <gtest/gtest.h>
 #include <sstream>
 

diff --git a/src/lib/dhcpsrv/tests/lease_file_loader_unittest.cc b/src/lib/dhcpsrv/tests/lease_file_loader_unittest.cc
index 3efd15fc54434cd735e5c3e5755cf11ee9a67a8f..e9d474b4b8614c316b16646830d1274a5b1a703e 100644 (file)
--- a/src/lib/dhcpsrv/tests/lease_file_loader_unittest.cc
+++ b/src/lib/dhcpsrv/tests/lease_file_loader_unittest.cc
@@ -10,7 +10,7 @@
 #include <dhcpsrv/csv_lease_file6.h>
 #include <dhcpsrv/memfile_lease_storage.h>
 #include <dhcpsrv/lease_file_loader.h>
-#include <dhcpsrv/tests/lease_file_io.h>
+#include <dhcpsrv/testutils/lease_file_io.h>
 #include <boost/scoped_ptr.hpp>
 #include <gtest/gtest.h>
 #include <sstream>

diff --git a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
index df4d586c3bd2a0be54c07062dd1badd822f9adb4..9ac60d1cac11e3bacbbf5d53a90a70e46a5731b8 100644 (file)
--- a/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/memfile_lease_mgr_unittest.cc
@@ -15,7 +15,7 @@
 #include <dhcpsrv/lease_mgr_factory.h>
 #include <dhcpsrv/memfile_lease_mgr.h>
 #include <dhcpsrv/timer_mgr.h>
-#include <dhcpsrv/tests/lease_file_io.h>
+#include <dhcpsrv/testutils/lease_file_io.h>
 #include <dhcpsrv/tests/test_utils.h>
 #include <dhcpsrv/tests/generic_lease_mgr_unittest.h>
 #include <util/pid_file.h>

diff --git a/src/lib/dhcpsrv/testutils/Makefile.am b/src/lib/dhcpsrv/testutils/Makefile.am
index de4b15a898025d7da49ba98df7d8a5b75931d0ca..a6b16b8d43902baf16a7f7275930b3a2793514d8 100644 (file)
--- a/src/lib/dhcpsrv/testutils/Makefile.am
+++ b/src/lib/dhcpsrv/testutils/Makefile.am
@@ -17,6 +17,9 @@ libdhcpsrvtest_la_SOURCES += dhcp4o6_test_ipc.cc dhcp4o6_test_ipc.h
 
 libdhcpsrvtest_la_SOURCES += schema.cc schema.h
 
+libdhcpsrvtest_la_SOURCES += lease_file_io.cc lease_file_io.h
+
+
 if HAVE_MYSQL
 libdhcpsrvtest_la_SOURCES += mysql_schema.cc mysql_schema.h
 endif

diff --git a/src/lib/dhcpsrv/tests/lease_file_io.cc b/src/lib/dhcpsrv/testutils/lease_file_io.cc
similarity index 96%
rename from src/lib/dhcpsrv/tests/lease_file_io.cc
rename to src/lib/dhcpsrv/testutils/lease_file_io.cc
index 26da172b8264a635a076f6dcd5741e50297bbb1f..c52740776d695f8e454af950cff6574a67079aa4 100644 (file)
--- a/src/lib/dhcpsrv/tests/lease_file_io.cc
+++ b/src/lib/dhcpsrv/testutils/lease_file_io.cc
@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#include <dhcpsrv/tests/lease_file_io.h>
+#include <dhcpsrv/testutils/lease_file_io.h>
 #include <fstream>
 #include <sstream>
 

diff --git a/src/lib/dhcpsrv/tests/lease_file_io.h b/src/lib/dhcpsrv/testutils/lease_file_io.h
similarity index 100%
rename from src/lib/dhcpsrv/tests/lease_file_io.h
rename to src/lib/dhcpsrv/testutils/lease_file_io.h