Home Explore Help
Sign In
zorun
/
kea
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

[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.
JINMEI Tatuya 12 years ago
parent
82225f72c3
commit
97e21bca2d
46 changed files with 7 additions and 8 deletions
Split View Show Diff Stats
  1. 2 2
      configure.ac
  2. 1 1
      src/lib/datasrc/Makefile.am
  3. 1 1
      src/lib/datasrc/memory/Makefile.am
  4. 1 1
      src/lib/datasrc/tests/Makefile.am
  5. 0 0
      src/lib/datasrc/tests/memory/.gitignore
  6. 1 2
      src/lib/datasrc/memory/tests/Makefile.am
  7. 0 0
      src/lib/datasrc/tests/memory/domaintree_unittest.cc
  8. 0 0
      src/lib/datasrc/tests/memory/memory_client_unittest.cc
  9. 0 0
      src/lib/datasrc/tests/memory/memory_segment_test.h
  10. 1 1
      src/lib/datasrc/memory/tests/rdata_serialization_unittest.cc
  11. 0 0
      src/lib/datasrc/tests/memory/rdataset_unittest.cc
  12. 0 0
      src/lib/datasrc/tests/memory/run_unittests.cc
  13. 0 0
      src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc
  14. 0 0
      src/lib/datasrc/tests/memory/testdata/Makefile.am
  15. 0 0
      src/lib/datasrc/tests/memory/testdata/empty.zone
  16. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-broken1.zone
  17. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-broken2.zone
  18. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-cname-and-not-nsec-1.zone
  19. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-cname-and-not-nsec-2.zone
  20. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-apex-1.zone
  21. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-apex-2.zone
  22. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-nonapex-1.zone
  23. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-nonapex-2.zone
  24. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-duplicate-type-bad.zone
  25. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-duplicate-type.zone
  26. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-empty.zone
  27. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-multiple-cname.zone
  28. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-multiple-dname.zone
  29. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-multiple-nsec3.zone
  30. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-multiple-nsec3param.zone
  31. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-multiple.zone
  32. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-nsec3-fewer-labels.zone
  33. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-nsec3-more-labels.zone
  34. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-nsec3-signed-no-param.zone
  35. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-nsec3-signed.zone
  36. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-out-of-zone.zone
  37. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-rrsig-follows-nothing.zone
  38. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-rrsigs.zone
  39. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-wildcard-dname.zone
  40. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-wildcard-ns.zone
  41. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org-wildcard-nsec3.zone
  42. 0 0
      src/lib/datasrc/tests/memory/testdata/example.org.zone
  43. 0 0
      src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc
  44. 0 0
      src/lib/datasrc/tests/memory/zone_data_unittest.cc
  45. 0 0
      src/lib/datasrc/tests/memory/zone_finder_unittest.cc
  46. 0 0
      src/lib/datasrc/tests/memory/zone_table_unittest.cc

+ 2 - 2
configure.ac
View File 

@@ -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

+ 1 - 1
src/lib/datasrc/Makefile.am
View File 

@@ -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

+ 1 - 1
src/lib/datasrc/memory/Makefile.am
View File 

@@ -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

+ 1 - 1
src/lib/datasrc/tests/Makefile.am
View File 

@@ -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

src/lib/datasrc/memory/tests/.gitignore → src/lib/datasrc/tests/memory/.gitignore
View File


+ 1 - 2
src/lib/datasrc/memory/tests/Makefile.am
View File 

@@ -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

src/lib/datasrc/memory/tests/domaintree_unittest.cc → src/lib/datasrc/tests/memory/domaintree_unittest.cc
View File


src/lib/datasrc/memory/tests/memory_client_unittest.cc → src/lib/datasrc/tests/memory/memory_client_unittest.cc
View File


src/lib/datasrc/memory/tests/memory_segment_test.h → src/lib/datasrc/tests/memory/memory_segment_test.h
View File


+ 1 - 1
src/lib/datasrc/memory/tests/rdata_serialization_unittest.cc
View File 

@@ -52,7 +52,7 @@ namespace isc {
 
 namespace datasrc{
 
 namespace memory {
 
 
-#include "../rdata_serialization_priv.cc"
 
+#include <datasrc/memory/rdata_serialization_priv.cc>
 
 
 }
 
 }

src/lib/datasrc/memory/tests/rdataset_unittest.cc → src/lib/datasrc/tests/memory/rdataset_unittest.cc
View File


src/lib/datasrc/memory/tests/run_unittests.cc → src/lib/datasrc/tests/memory/run_unittests.cc
View File


src/lib/datasrc/memory/tests/segment_object_holder_unittest.cc → src/lib/datasrc/tests/memory/segment_object_holder_unittest.cc
View File


src/lib/datasrc/memory/tests/testdata/Makefile.am → src/lib/datasrc/tests/memory/testdata/Makefile.am
View File


src/lib/datasrc/memory/tests/testdata/empty.zone → src/lib/datasrc/tests/memory/testdata/empty.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-broken1.zone → src/lib/datasrc/tests/memory/testdata/example.org-broken1.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-broken2.zone → src/lib/datasrc/tests/memory/testdata/example.org-broken2.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-cname-and-not-nsec-1.zone → src/lib/datasrc/tests/memory/testdata/example.org-cname-and-not-nsec-1.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-cname-and-not-nsec-2.zone → src/lib/datasrc/tests/memory/testdata/example.org-cname-and-not-nsec-2.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-apex-1.zone → src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-apex-1.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-apex-2.zone → src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-apex-2.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-nonapex-1.zone → src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-nonapex-1.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-dname-ns-nonapex-2.zone → src/lib/datasrc/tests/memory/testdata/example.org-dname-ns-nonapex-2.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-duplicate-type-bad.zone → src/lib/datasrc/tests/memory/testdata/example.org-duplicate-type-bad.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-duplicate-type.zone → src/lib/datasrc/tests/memory/testdata/example.org-duplicate-type.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-empty.zone → src/lib/datasrc/tests/memory/testdata/example.org-empty.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-multiple-cname.zone → src/lib/datasrc/tests/memory/testdata/example.org-multiple-cname.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-multiple-dname.zone → src/lib/datasrc/tests/memory/testdata/example.org-multiple-dname.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3.zone → src/lib/datasrc/tests/memory/testdata/example.org-multiple-nsec3.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-multiple-nsec3param.zone → src/lib/datasrc/tests/memory/testdata/example.org-multiple-nsec3param.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-multiple.zone → src/lib/datasrc/tests/memory/testdata/example.org-multiple.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-nsec3-fewer-labels.zone → src/lib/datasrc/tests/memory/testdata/example.org-nsec3-fewer-labels.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-nsec3-more-labels.zone → src/lib/datasrc/tests/memory/testdata/example.org-nsec3-more-labels.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-nsec3-signed-no-param.zone → src/lib/datasrc/tests/memory/testdata/example.org-nsec3-signed-no-param.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-nsec3-signed.zone → src/lib/datasrc/tests/memory/testdata/example.org-nsec3-signed.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-out-of-zone.zone → src/lib/datasrc/tests/memory/testdata/example.org-out-of-zone.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-rrsig-follows-nothing.zone → src/lib/datasrc/tests/memory/testdata/example.org-rrsig-follows-nothing.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-rrsigs.zone → src/lib/datasrc/tests/memory/testdata/example.org-rrsigs.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-wildcard-dname.zone → src/lib/datasrc/tests/memory/testdata/example.org-wildcard-dname.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-wildcard-ns.zone → src/lib/datasrc/tests/memory/testdata/example.org-wildcard-ns.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org-wildcard-nsec3.zone → src/lib/datasrc/tests/memory/testdata/example.org-wildcard-nsec3.zone
View File


src/lib/datasrc/memory/tests/testdata/example.org.zone → src/lib/datasrc/tests/memory/testdata/example.org.zone
View File


src/lib/datasrc/memory/tests/treenode_rrset_unittest.cc → src/lib/datasrc/tests/memory/treenode_rrset_unittest.cc
View File


src/lib/datasrc/memory/tests/zone_data_unittest.cc → src/lib/datasrc/tests/memory/zone_data_unittest.cc
View File


src/lib/datasrc/memory/tests/zone_finder_unittest.cc → src/lib/datasrc/tests/memory/zone_finder_unittest.cc
View File


src/lib/datasrc/memory/tests/zone_table_unittest.cc → src/lib/datasrc/tests/memory/zone_table_unittest.cc
View File