[2219] moved in-memory unit tests under datasrc/tests to resolve dependency.

the tests now depend on libdatasrc, while libdatasrc needs memory.la.
so we need to build any tests after building all libraries.

diff --git a/configure.ac b/configure.ac
index 9d7b7ae7139588a4cf90f4a5db6f131e886c8909..4c684683fb977d15781420275421de0ffedc0b39 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1187,11 +1187,11 @@ AC_CONFIG_FILES([Makefile
                  src/lib/exceptions/tests/Makefile
                  src/lib/datasrc/Makefile
                  src/lib/datasrc/memory/Makefile
-                 src/lib/datasrc/memory/tests/Makefile
-                 src/lib/datasrc/memory/tests/testdata/Makefile
                  src/lib/datasrc/memory/benchmarks/Makefile
                  src/lib/datasrc/tests/Makefile
                  src/lib/datasrc/tests/testdata/Makefile
+                 src/lib/datasrc/tests/memory/Makefile
+                 src/lib/datasrc/tests/memory/testdata/Makefile
                  src/lib/xfr/Makefile
                  src/lib/xfr/tests/Makefile
                  src/lib/log/Makefile

diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
index 3b9e57290be28681e6c588757478f6c924ac4769..f916e664bb91669b595d3b6915ca706df35fea7b 100644 (file)
--- a/src/lib/datasrc/Makefile.am
+++ b/src/lib/datasrc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . memory tests
+SUBDIRS = memory . tests
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns

diff --git a/src/lib/datasrc/memory/Makefile.am b/src/lib/datasrc/memory/Makefile.am
index eea9c0b5f09fe3a71fb140ef36f942cce2db2d42..3bdec0d06aeab0f864f0964b6b43c493abd438fc 100644 (file)
--- a/src/lib/datasrc/memory/Makefile.am
+++ b/src/lib/datasrc/memory/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = . tests benchmarks
+SUBDIRS = . benchmarks
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns

diff --git a/src/lib/datasrc/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
index b73a64a7033b3ac40e477c57289bafd616be6d89..df9a416076cea4c69f3fdcb2ecbe66a222561dad 100644 (file)
--- a/src/lib/datasrc/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = testdata
+SUBDIRS = . memory testdata
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
 AM_CPPFLAGS += -I$(top_builddir)/src/lib/dns -I$(top_srcdir)/src/lib/dns

diff --git a/src/lib/datasrc/memory/tests/.gitignore b/src/lib/datasrc/tests/memory/.gitignore
similarity index 100%
rename from src/lib/datasrc/memory/tests/.gitignore
rename to src/lib/datasrc/tests/memory/.gitignore

diff --git a/src/lib/datasrc/memory/tests/Makefile.am b/src/lib/datasrc/tests/memory/Makefile.am
similarity index 92%
rename from src/lib/datasrc/memory/tests/Makefile.am
rename to src/lib/datasrc/tests/memory/Makefile.am
index 74b1a3d3fc4c494c1b985aa66bc2dc5d9c3156ba..00d5594295f9cd8aa7deea8bc59e8012ae0187c0 100644 (file)
--- a/src/lib/datasrc/memory/tests/Makefile.am
+++ b/src/lib/datasrc/tests/memory/Makefile.am
@@ -36,8 +36,7 @@ run_unittests_SOURCES += memory_client_unittest.cc
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS  = $(AM_LDFLAGS)  $(GTEST_LDFLAGS)
 
-run_unittests_LDADD = $(builddir)/../libdatasrc_memory.la
-run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
+run_unittests_LDADD = $(top_builddir)/src/lib/datasrc/libb10-datasrc.la
 run_unittests_LDADD += $(top_builddir)/src/lib/dns/libb10-dns++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 run_unittests_LDADD += $(top_builddir)/src/lib/util/libb10-util.la

diff --git a/src/lib/datasrc/memory/tests/domaintree_unittest.cc b/src/lib/datasrc/tests/memory/domaintree_unittest.cc
similarity index 100%
rename from src/lib/datasrc/memory/tests/domaintree_unittest.cc
rename to src/lib/datasrc/tests/memory/domaintree_unittest.cc

diff --git a/src/lib/datasrc/memory/tests/memory_client_unittest.cc b/src/lib/datasrc/tests/memory/memory_client_unittest.cc
similarity index 100%
rename from src/lib/datasrc/memory/tests/memory_client_unittest.cc
rename to src/lib/datasrc/tests/memory/memory_client_unittest.cc

diff --git a/src/lib/datasrc/memory/tests/memory_segment_test.h b/src/lib/datasrc/tests/memory/memory_segment_test.h
similarity index 100%
rename from src/lib/datasrc/memory/tests/memory_segment_test.h
rename to src/lib/datasrc/tests/memory/memory_segment_test.h

diff --git a/src/lib/datasrc/memory/tests/rdata_serialization_unittest.cc b/src/lib/datasrc/tests/memory/rdata_serialization_unittest.cc
similarity index 99%
rename from src/lib/datasrc/memory/tests/rdata_serialization_unittest.cc
rename to src/lib/datasrc/tests/memory/rdata_serialization_unittest.cc
index 12b613a8ec762582cb7aead9c832487b9c9d488b..58c6cb1527b6697a4ebd120823b6da92ad078d41 100644 (file)
--- a/src/lib/datasrc/memory/tests/rdata_serialization_unittest.cc
+++ b/src/lib/datasrc/tests/memory/rdata_serialization_unittest.cc
@@ -52,7 +52,7 @@ namespace isc {
 namespace datasrc{
 namespace memory {
 
-#include "../rdata_serialization_priv.cc"
+#include <datasrc/memory/rdata_serialization_priv.cc>
 
 }
 }

diff --git a/src/lib/datasrc/memory/tests/rdataset_unittest.cc b/src/lib/datasrc/tests/memory/rdataset_unittest.cc
similarity index 100%
rename from src/lib/datasrc/memory/tests/rdataset_unittest.cc
rename to src/lib/datasrc/tests/memory/rdataset_unittest.cc

diff --git a/src/lib/datasrc/memory/tests/run_unittests.cc b/src/lib/datasrc/tests/memory/run_unittests.cc
similarity index 100%
rename from src/lib/datasrc/memory/tests/run_unittests.cc
rename to src/lib/datasrc/tests/memory/run_unittests.cc

diff --git a/src/lib/datasrc/memory/tests/segment_object_holder_unittest.cc b/src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc
similarity index 100%
rename from src/lib/datasrc/memory/tests/segment_object_holder_unittest.cc
rename to src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc

diff --git a/src/lib/datasrc/memory/tests/testdata/Makefile.am b/src/lib/datasrc/tests/memory/testdata/Makefile.am
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/Makefile.am
rename to src/lib/datasrc/tests/memory/testdata/Makefile.am

diff --git a/src/lib/datasrc/memory/tests/testdata/empty.zone b/src/lib/datasrc/tests/memory/testdata/empty.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/empty.zone
rename to src/lib/datasrc/tests/memory/testdata/empty.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-broken1.zone b/src/lib/datasrc/tests/memory/testdata/example.org-broken1.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-broken1.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-broken1.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-broken2.zone b/src/lib/datasrc/tests/memory/testdata/example.org-broken2.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-broken2.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-broken2.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-cname-and-not-nsec-1.zone b/src/lib/datasrc/tests/memory/testdata/example.org-cname-and-not-nsec-1.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-cname-and-not-nsec-1.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-cname-and-not-nsec-1.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-cname-and-not-nsec-2.zone b/src/lib/datasrc/tests/memory/testdata/example.org-cname-and-not-nsec-2.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-cname-and-not-nsec-2.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-cname-and-not-nsec-2.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-apex-1.zone b/src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-apex-1.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-apex-1.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-apex-1.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-apex-2.zone b/src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-apex-2.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-apex-2.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-apex-2.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-nonapex-1.zone b/src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-nonapex-1.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-nonapex-1.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-nonapex-1.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-nonapex-2.zone b/src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-nonapex-2.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-nonapex-2.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-nonapex-2.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-duplicate-type-bad.zone b/src/lib/datasrc/tests/memory/testdata/example.org-duplicate-type-bad.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-duplicate-type-bad.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-duplicate-type-bad.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-duplicate-type.zone b/src/lib/datasrc/tests/memory/testdata/example.org-duplicate-type.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-duplicate-type.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-duplicate-type.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-empty.zone b/src/lib/datasrc/tests/memory/testdata/example.org-empty.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-empty.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-empty.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-multiple-cname.zone b/src/lib/datasrc/tests/memory/testdata/example.org-multiple-cname.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-multiple-cname.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-multiple-cname.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-multiple-dname.zone b/src/lib/datasrc/tests/memory/testdata/example.org-multiple-dname.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-multiple-dname.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-multiple-dname.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3.zone b/src/lib/datasrc/tests/memory/testdata/example.org-multiple-nsec3.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-multiple-nsec3.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3param.zone b/src/lib/datasrc/tests/memory/testdata/example.org-multiple-nsec3param.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3param.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-multiple-nsec3param.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-multiple.zone b/src/lib/datasrc/tests/memory/testdata/example.org-multiple.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-multiple.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-multiple.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-nsec3-fewer-labels.zone b/src/lib/datasrc/tests/memory/testdata/example.org-nsec3-fewer-labels.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-nsec3-fewer-labels.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-nsec3-fewer-labels.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-nsec3-more-labels.zone b/src/lib/datasrc/tests/memory/testdata/example.org-nsec3-more-labels.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-nsec3-more-labels.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-nsec3-more-labels.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-nsec3-signed-no-param.zone b/src/lib/datasrc/tests/memory/testdata/example.org-nsec3-signed-no-param.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-nsec3-signed-no-param.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-nsec3-signed-no-param.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-nsec3-signed.zone b/src/lib/datasrc/tests/memory/testdata/example.org-nsec3-signed.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-nsec3-signed.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-nsec3-signed.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-out-of-zone.zone b/src/lib/datasrc/tests/memory/testdata/example.org-out-of-zone.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-out-of-zone.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-out-of-zone.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-rrsig-follows-nothing.zone b/src/lib/datasrc/tests/memory/testdata/example.org-rrsig-follows-nothing.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-rrsig-follows-nothing.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-rrsig-follows-nothing.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-rrsigs.zone b/src/lib/datasrc/tests/memory/testdata/example.org-rrsigs.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-rrsigs.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-rrsigs.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-wildcard-dname.zone b/src/lib/datasrc/tests/memory/testdata/example.org-wildcard-dname.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-wildcard-dname.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-wildcard-dname.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-wildcard-ns.zone b/src/lib/datasrc/tests/memory/testdata/example.org-wildcard-ns.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-wildcard-ns.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-wildcard-ns.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org-wildcard-nsec3.zone b/src/lib/datasrc/tests/memory/testdata/example.org-wildcard-nsec3.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org-wildcard-nsec3.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org-wildcard-nsec3.zone

diff --git a/src/lib/datasrc/memory/tests/testdata/example.org.zone b/src/lib/datasrc/tests/memory/testdata/example.org.zone
similarity index 100%
rename from src/lib/datasrc/memory/tests/testdata/example.org.zone
rename to src/lib/datasrc/tests/memory/testdata/example.org.zone

diff --git a/src/lib/datasrc/memory/tests/treenode_rrset_unittest.cc b/src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc
similarity index 100%
rename from src/lib/datasrc/memory/tests/treenode_rrset_unittest.cc
rename to src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc

diff --git a/src/lib/datasrc/memory/tests/zone_data_unittest.cc b/src/lib/datasrc/tests/memory/zone_data_unittest.cc
similarity index 100%
rename from src/lib/datasrc/memory/tests/zone_data_unittest.cc
rename to src/lib/datasrc/tests/memory/zone_data_unittest.cc

diff --git a/src/lib/datasrc/memory/tests/zone_finder_unittest.cc b/src/lib/datasrc/tests/memory/zone_finder_unittest.cc
similarity index 100%
rename from src/lib/datasrc/memory/tests/zone_finder_unittest.cc
rename to src/lib/datasrc/tests/memory/zone_finder_unittest.cc

diff --git a/src/lib/datasrc/memory/tests/zone_table_unittest.cc b/src/lib/datasrc/tests/memory/zone_table_unittest.cc
similarity index 100%
rename from src/lib/datasrc/memory/tests/zone_table_unittest.cc
rename to src/lib/datasrc/tests/memory/zone_table_unittest.cc