From f51e96e1159776823f64857d79984161451b0b99 Mon Sep 17 00:00:00 2001
From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Thu, 8 Mar 2018 16:58:42 +0100
Subject: [PATCH] tests: move knot tests to separate directory
---
tests/.gitignore | 52 ++++++++--------
tests/Makefile.am | 62 +++++++++----------
tests/knot/semantic_check_data/Makefile.inc | 16 +++++
.../semantic_check_data/cdnskey.cds | 0
.../semantic_check_data/cdnskey.invalid | 0
.../semantic_check_data/cdnskey.invalid.param | 0
.../semantic_check_data/cdnskey.nocdnskey | 0
.../semantic_check_data/cdnskey.nocds | 0
.../semantic_check_data/cdnskey.nodnskey | 0
.../semantic_check_data/cdnskey.two | 0
.../semantic_check_data/cname_extra_01.zone | 0
.../semantic_check_data/cname_extra_02.signed | 0
.../semantic_check_data/cname_multiple.zone | 0
.../different_signer_name.signed | 0
.../dname_apex_nsec3.signed | 0
.../semantic_check_data/dname_children.zone | 0
.../dnskey_param_error.signed | 0
.../semantic_check_data/duplicate.signature | 0
.../semantic_check_data/invalid_ds.signed | 0
.../semantic_check_data/missing.signed | 0
.../semantic_check_data/missing_glue_01.zone | 0
.../semantic_check_data/missing_glue_02.zone | 0
.../semantic_check_data/missing_glue_03.zone | 0
.../semantic_check_data/missing_ns.zone | 0
.../no_error_delegaton_bitmap.signed | 0
.../no_error_nsec3_delegation.signed | 0
.../no_error_nsec3_optout.signed | 0
.../no_error_wildcard_glue.zone | 0
.../semantic_check_data/no_rrsig.signed | 0
.../no_rrsig_with_delegation.signed | 0
.../semantic_check_data/nsec3_chain_01.signed | 0
.../semantic_check_data/nsec3_chain_02.signed | 0
.../semantic_check_data/nsec3_chain_03.signed | 0
.../semantic_check_data/nsec3_ds.signed | 0
.../semantic_check_data/nsec3_missing.signed | 0
.../semantic_check_data/nsec3_optout.signed | 0
.../nsec3_param_invalid.signed | 0
.../nsec3_wrong_bitmap_01.signed | 0
.../nsec3_wrong_bitmap_02.signed | 0
.../nsec_broken_chain_01.signed | 0
.../nsec_broken_chain_02.signed | 0
.../semantic_check_data/nsec_missing.signed | 0
.../semantic_check_data/nsec_multiple.signed | 0
.../nsec_wrong_bitmap_01.signed | 0
.../nsec_wrong_bitmap_02.signed | 0
.../rrsig_rdata_ttl.signed | 0
.../semantic_check_data/rrsig_signed.signed | 0
.../semantic_check_data/rrsig_ttl.signed | 0
tests/{ => knot}/test_acl.c | 0
tests/{ => knot}/test_changeset.c | 0
tests/{ => knot}/test_conf.c | 0
tests/{ => knot}/test_conf.h | 0
tests/{ => knot}/test_conf_tools.c | 0
tests/{ => knot}/test_confdb.c | 0
tests/{ => knot}/test_confio.c | 0
tests/{ => knot}/test_dthreads.c | 0
tests/{ => knot}/test_fdset.c | 0
tests/{ => knot}/test_journal.c | 0
tests/{ => knot}/test_kasp_db.c | 0
tests/{ => knot}/test_node.c | 0
tests/{ => knot}/test_process_query.c | 0
tests/{ => knot}/test_query_module.c | 0
tests/{ => knot}/test_requestor.c | 0
tests/{ => knot}/test_semantic_check.in | 2 +-
tests/{ => knot}/test_server.c | 0
tests/{ => knot}/test_server.h | 0
tests/{ => knot}/test_worker_pool.c | 0
tests/{ => knot}/test_worker_queue.c | 0
tests/{ => knot}/test_zone-tree.c | 0
tests/{ => knot}/test_zone-update.c | 0
tests/{ => knot}/test_zone_events.c | 0
tests/{ => knot}/test_zone_serial.c | 0
tests/{ => knot}/test_zone_timers.c | 0
tests/{ => knot}/test_zonedb.c | 0
tests/semantic_check_data/Makefile.inc | 16 -----
75 files changed, 74 insertions(+), 74 deletions(-)
create mode 100644 tests/knot/semantic_check_data/Makefile.inc
rename tests/{ => knot}/semantic_check_data/cdnskey.cds (100%)
rename tests/{ => knot}/semantic_check_data/cdnskey.invalid (100%)
rename tests/{ => knot}/semantic_check_data/cdnskey.invalid.param (100%)
rename tests/{ => knot}/semantic_check_data/cdnskey.nocdnskey (100%)
rename tests/{ => knot}/semantic_check_data/cdnskey.nocds (100%)
rename tests/{ => knot}/semantic_check_data/cdnskey.nodnskey (100%)
rename tests/{ => knot}/semantic_check_data/cdnskey.two (100%)
rename tests/{ => knot}/semantic_check_data/cname_extra_01.zone (100%)
rename tests/{ => knot}/semantic_check_data/cname_extra_02.signed (100%)
rename tests/{ => knot}/semantic_check_data/cname_multiple.zone (100%)
rename tests/{ => knot}/semantic_check_data/different_signer_name.signed (100%)
rename tests/{ => knot}/semantic_check_data/dname_apex_nsec3.signed (100%)
rename tests/{ => knot}/semantic_check_data/dname_children.zone (100%)
rename tests/{ => knot}/semantic_check_data/dnskey_param_error.signed (100%)
rename tests/{ => knot}/semantic_check_data/duplicate.signature (100%)
rename tests/{ => knot}/semantic_check_data/invalid_ds.signed (100%)
rename tests/{ => knot}/semantic_check_data/missing.signed (100%)
rename tests/{ => knot}/semantic_check_data/missing_glue_01.zone (100%)
rename tests/{ => knot}/semantic_check_data/missing_glue_02.zone (100%)
rename tests/{ => knot}/semantic_check_data/missing_glue_03.zone (100%)
rename tests/{ => knot}/semantic_check_data/missing_ns.zone (100%)
rename tests/{ => knot}/semantic_check_data/no_error_delegaton_bitmap.signed (100%)
rename tests/{ => knot}/semantic_check_data/no_error_nsec3_delegation.signed (100%)
rename tests/{ => knot}/semantic_check_data/no_error_nsec3_optout.signed (100%)
rename tests/{ => knot}/semantic_check_data/no_error_wildcard_glue.zone (100%)
rename tests/{ => knot}/semantic_check_data/no_rrsig.signed (100%)
rename tests/{ => knot}/semantic_check_data/no_rrsig_with_delegation.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec3_chain_01.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec3_chain_02.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec3_chain_03.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec3_ds.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec3_missing.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec3_optout.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec3_param_invalid.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec3_wrong_bitmap_01.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec3_wrong_bitmap_02.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec_broken_chain_01.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec_broken_chain_02.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec_missing.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec_multiple.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec_wrong_bitmap_01.signed (100%)
rename tests/{ => knot}/semantic_check_data/nsec_wrong_bitmap_02.signed (100%)
rename tests/{ => knot}/semantic_check_data/rrsig_rdata_ttl.signed (100%)
rename tests/{ => knot}/semantic_check_data/rrsig_signed.signed (100%)
rename tests/{ => knot}/semantic_check_data/rrsig_ttl.signed (100%)
rename tests/{ => knot}/test_acl.c (100%)
rename tests/{ => knot}/test_changeset.c (100%)
rename tests/{ => knot}/test_conf.c (100%)
rename tests/{ => knot}/test_conf.h (100%)
rename tests/{ => knot}/test_conf_tools.c (100%)
rename tests/{ => knot}/test_confdb.c (100%)
rename tests/{ => knot}/test_confio.c (100%)
rename tests/{ => knot}/test_dthreads.c (100%)
rename tests/{ => knot}/test_fdset.c (100%)
rename tests/{ => knot}/test_journal.c (100%)
rename tests/{ => knot}/test_kasp_db.c (100%)
rename tests/{ => knot}/test_node.c (100%)
rename tests/{ => knot}/test_process_query.c (100%)
rename tests/{ => knot}/test_query_module.c (100%)
rename tests/{ => knot}/test_requestor.c (100%)
rename tests/{ => knot}/test_semantic_check.in (99%)
rename tests/{ => knot}/test_server.c (100%)
rename tests/{ => knot}/test_server.h (100%)
rename tests/{ => knot}/test_worker_pool.c (100%)
rename tests/{ => knot}/test_worker_queue.c (100%)
rename tests/{ => knot}/test_zone-tree.c (100%)
rename tests/{ => knot}/test_zone-update.c (100%)
rename tests/{ => knot}/test_zone_events.c (100%)
rename tests/{ => knot}/test_zone_serial.c (100%)
rename tests/{ => knot}/test_zone_timers.c (100%)
rename tests/{ => knot}/test_zonedb.c (100%)
delete mode 100644 tests/semantic_check_data/Makefile.inc
diff --git a/tests/.gitignore b/tests/.gitignore
index 2fa6003efb..054ac84536 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -16,6 +16,32 @@
/contrib/test_time
/contrib/test_wire_ctx
+/knot/test_acl
+/knot/test_changeset
+/knot/test_conf
+/knot/test_conf_tools
+/knot/test_confdb
+/knot/test_confio
+/knot/test_dthreads
+/knot/test_fdset
+/knot/test_journal
+/knot/test_kasp_db
+/knot/test_node
+/knot/test_process_answer
+/knot/test_process_query
+/knot/test_query_module
+/knot/test_requestor
+/knot/test_semantic_check
+/knot/test_server
+/knot/test_worker_pool
+/knot/test_worker_queue
+/knot/test_zone-tree
+/knot/test_zone-update
+/knot/test_zone_events
+/knot/test_zone_serial
+/knot/test_zone_timers
+/knot/test_zonedb
+
/libknot/test_control
/libknot/test_cookies
/libknot/test_db
@@ -41,29 +67,3 @@
/utils/test_cert
/utils/test_lookup
-
-/test_acl
-/test_changeset
-/test_conf
-/test_conf_tools
-/test_confdb
-/test_confio
-/test_dthreads
-/test_fdset
-/test_journal
-/test_kasp_db
-/test_node
-/test_process_answer
-/test_process_query
-/test_query_module
-/test_requestor
-/test_semantic_check
-/test_server
-/test_worker_pool
-/test_worker_queue
-/test_zone-tree
-/test_zone-update
-/test_zone_events
-/test_zone_serial
-/test_zone_timers
-/test_zonedb
diff --git a/tests/Makefile.am b/tests/Makefile.am
index de3bf5b3cb..d4cc6367cb 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,6 +26,31 @@ check_PROGRAMS = \
contrib/test_time \
contrib/test_wire_ctx
+check_PROGRAMS += \
+ knot/test_acl \
+ knot/test_changeset \
+ knot/test_conf \
+ knot/test_conf_tools \
+ knot/test_confdb \
+ knot/test_confio \
+ knot/test_dthreads \
+ knot/test_fdset \
+ knot/test_journal \
+ knot/test_kasp_db \
+ knot/test_node \
+ knot/test_process_query \
+ knot/test_query_module \
+ knot/test_requestor \
+ knot/test_server \
+ knot/test_worker_pool \
+ knot/test_worker_queue \
+ knot/test_zone-tree \
+ knot/test_zone-update \
+ knot/test_zone_events \
+ knot/test_zone_serial \
+ knot/test_zone_timers \
+ knot/test_zonedb
+
check_PROGRAMS += \
libknot/test_control \
libknot/test_cookies \
@@ -51,31 +76,6 @@ check_PROGRAMS += \
utils/test_cert \
utils/test_lookup
-check_PROGRAMS += \
- test_acl \
- test_changeset \
- test_conf \
- test_conf_tools \
- test_confdb \
- test_confio \
- test_dthreads \
- test_fdset \
- test_journal \
- test_kasp_db \
- test_node \
- test_process_query \
- test_query_module \
- test_requestor \
- test_server \
- test_worker_pool \
- test_worker_queue \
- test_zone-tree \
- test_zone-update \
- test_zone_events \
- test_zone_serial \
- test_zone_timers \
- test_zonedb
-
if STATIC_MODULE_onlinesign
check_PROGRAMS += \
modules/test_onlinesign
@@ -117,7 +117,7 @@ utils_test_cert_LDADD = \
CLEANFILES = runtests.log
-include $(srcdir)/semantic_check_data/Makefile.inc
+include $(srcdir)/knot/semantic_check_data/Makefile.inc
check-compile: $(check_PROGRAMS) $(check_SCRIPTS)
@@ -132,8 +132,8 @@ check-local: $(check_PROGRAMS) $(check_SCRIPTS)
$(check_PROGRAMS) $(check_SCRIPTS); \
$(AM_V_RUNTESTS)
-test_acl_SOURCES = test_acl.c test_conf.h
-test_conf_SOURCES = test_conf.c test_conf.h
-test_confdb_SOURCES = test_confdb.c test_conf.h
-test_confio_SOURCES = test_confio.c test_conf.h
-test_process_query_SOURCES = test_process_query.c test_server.h test_conf.h
+knot_test_acl_SOURCES = knot/test_acl.c knot/test_conf.h
+knot_test_conf_SOURCES = knot/test_conf.c knot/test_conf.h
+knot_test_confdb_SOURCES = knot/test_confdb.c knot/test_conf.h
+knot_test_confio_SOURCES = knot/test_confio.c knot/test_conf.h
+knot_test_process_query_SOURCES = knot/test_process_query.c knot/test_server.h knot/test_conf.h
diff --git a/tests/knot/semantic_check_data/Makefile.inc b/tests/knot/semantic_check_data/Makefile.inc
new file mode 100644
index 0000000000..a89dd9ce4c
--- /dev/null
+++ b/tests/knot/semantic_check_data/Makefile.inc
@@ -0,0 +1,16 @@
+check_SCRIPTS = \
+ knot/test_semantic_check
+
+CLEANFILES += $(check_SCRIPTS)
+
+edit = $(SED) \
+ -e 's|@top_srcdir[@]|$(abs_top_srcdir)|g' \
+ -e 's|@top_builddir[@]|$(abs_top_builddir)|g'
+
+knot/test_semantic_check: $(top_srcdir)/tests/knot/test_semantic_check.in
+ @$(edit) < $(top_srcdir)/tests/knot/test_semantic_check.in > $(top_builddir)/tests/knot/test_semantic_check
+ @chmod +x $(top_builddir)/tests/knot/test_semantic_check
+
+EXTRA_DIST = \
+ knot/test_semantic_check.in \
+ knot/semantic_check_data
diff --git a/tests/semantic_check_data/cdnskey.cds b/tests/knot/semantic_check_data/cdnskey.cds
similarity index 100%
rename from tests/semantic_check_data/cdnskey.cds
rename to tests/knot/semantic_check_data/cdnskey.cds
diff --git a/tests/semantic_check_data/cdnskey.invalid b/tests/knot/semantic_check_data/cdnskey.invalid
similarity index 100%
rename from tests/semantic_check_data/cdnskey.invalid
rename to tests/knot/semantic_check_data/cdnskey.invalid
diff --git a/tests/semantic_check_data/cdnskey.invalid.param b/tests/knot/semantic_check_data/cdnskey.invalid.param
similarity index 100%
rename from tests/semantic_check_data/cdnskey.invalid.param
rename to tests/knot/semantic_check_data/cdnskey.invalid.param
diff --git a/tests/semantic_check_data/cdnskey.nocdnskey b/tests/knot/semantic_check_data/cdnskey.nocdnskey
similarity index 100%
rename from tests/semantic_check_data/cdnskey.nocdnskey
rename to tests/knot/semantic_check_data/cdnskey.nocdnskey
diff --git a/tests/semantic_check_data/cdnskey.nocds b/tests/knot/semantic_check_data/cdnskey.nocds
similarity index 100%
rename from tests/semantic_check_data/cdnskey.nocds
rename to tests/knot/semantic_check_data/cdnskey.nocds
diff --git a/tests/semantic_check_data/cdnskey.nodnskey b/tests/knot/semantic_check_data/cdnskey.nodnskey
similarity index 100%
rename from tests/semantic_check_data/cdnskey.nodnskey
rename to tests/knot/semantic_check_data/cdnskey.nodnskey
diff --git a/tests/semantic_check_data/cdnskey.two b/tests/knot/semantic_check_data/cdnskey.two
similarity index 100%
rename from tests/semantic_check_data/cdnskey.two
rename to tests/knot/semantic_check_data/cdnskey.two
diff --git a/tests/semantic_check_data/cname_extra_01.zone b/tests/knot/semantic_check_data/cname_extra_01.zone
similarity index 100%
rename from tests/semantic_check_data/cname_extra_01.zone
rename to tests/knot/semantic_check_data/cname_extra_01.zone
diff --git a/tests/semantic_check_data/cname_extra_02.signed b/tests/knot/semantic_check_data/cname_extra_02.signed
similarity index 100%
rename from tests/semantic_check_data/cname_extra_02.signed
rename to tests/knot/semantic_check_data/cname_extra_02.signed
diff --git a/tests/semantic_check_data/cname_multiple.zone b/tests/knot/semantic_check_data/cname_multiple.zone
similarity index 100%
rename from tests/semantic_check_data/cname_multiple.zone
rename to tests/knot/semantic_check_data/cname_multiple.zone
diff --git a/tests/semantic_check_data/different_signer_name.signed b/tests/knot/semantic_check_data/different_signer_name.signed
similarity index 100%
rename from tests/semantic_check_data/different_signer_name.signed
rename to tests/knot/semantic_check_data/different_signer_name.signed
diff --git a/tests/semantic_check_data/dname_apex_nsec3.signed b/tests/knot/semantic_check_data/dname_apex_nsec3.signed
similarity index 100%
rename from tests/semantic_check_data/dname_apex_nsec3.signed
rename to tests/knot/semantic_check_data/dname_apex_nsec3.signed
diff --git a/tests/semantic_check_data/dname_children.zone b/tests/knot/semantic_check_data/dname_children.zone
similarity index 100%
rename from tests/semantic_check_data/dname_children.zone
rename to tests/knot/semantic_check_data/dname_children.zone
diff --git a/tests/semantic_check_data/dnskey_param_error.signed b/tests/knot/semantic_check_data/dnskey_param_error.signed
similarity index 100%
rename from tests/semantic_check_data/dnskey_param_error.signed
rename to tests/knot/semantic_check_data/dnskey_param_error.signed
diff --git a/tests/semantic_check_data/duplicate.signature b/tests/knot/semantic_check_data/duplicate.signature
similarity index 100%
rename from tests/semantic_check_data/duplicate.signature
rename to tests/knot/semantic_check_data/duplicate.signature
diff --git a/tests/semantic_check_data/invalid_ds.signed b/tests/knot/semantic_check_data/invalid_ds.signed
similarity index 100%
rename from tests/semantic_check_data/invalid_ds.signed
rename to tests/knot/semantic_check_data/invalid_ds.signed
diff --git a/tests/semantic_check_data/missing.signed b/tests/knot/semantic_check_data/missing.signed
similarity index 100%
rename from tests/semantic_check_data/missing.signed
rename to tests/knot/semantic_check_data/missing.signed
diff --git a/tests/semantic_check_data/missing_glue_01.zone b/tests/knot/semantic_check_data/missing_glue_01.zone
similarity index 100%
rename from tests/semantic_check_data/missing_glue_01.zone
rename to tests/knot/semantic_check_data/missing_glue_01.zone
diff --git a/tests/semantic_check_data/missing_glue_02.zone b/tests/knot/semantic_check_data/missing_glue_02.zone
similarity index 100%
rename from tests/semantic_check_data/missing_glue_02.zone
rename to tests/knot/semantic_check_data/missing_glue_02.zone
diff --git a/tests/semantic_check_data/missing_glue_03.zone b/tests/knot/semantic_check_data/missing_glue_03.zone
similarity index 100%
rename from tests/semantic_check_data/missing_glue_03.zone
rename to tests/knot/semantic_check_data/missing_glue_03.zone
diff --git a/tests/semantic_check_data/missing_ns.zone b/tests/knot/semantic_check_data/missing_ns.zone
similarity index 100%
rename from tests/semantic_check_data/missing_ns.zone
rename to tests/knot/semantic_check_data/missing_ns.zone
diff --git a/tests/semantic_check_data/no_error_delegaton_bitmap.signed b/tests/knot/semantic_check_data/no_error_delegaton_bitmap.signed
similarity index 100%
rename from tests/semantic_check_data/no_error_delegaton_bitmap.signed
rename to tests/knot/semantic_check_data/no_error_delegaton_bitmap.signed
diff --git a/tests/semantic_check_data/no_error_nsec3_delegation.signed b/tests/knot/semantic_check_data/no_error_nsec3_delegation.signed
similarity index 100%
rename from tests/semantic_check_data/no_error_nsec3_delegation.signed
rename to tests/knot/semantic_check_data/no_error_nsec3_delegation.signed
diff --git a/tests/semantic_check_data/no_error_nsec3_optout.signed b/tests/knot/semantic_check_data/no_error_nsec3_optout.signed
similarity index 100%
rename from tests/semantic_check_data/no_error_nsec3_optout.signed
rename to tests/knot/semantic_check_data/no_error_nsec3_optout.signed
diff --git a/tests/semantic_check_data/no_error_wildcard_glue.zone b/tests/knot/semantic_check_data/no_error_wildcard_glue.zone
similarity index 100%
rename from tests/semantic_check_data/no_error_wildcard_glue.zone
rename to tests/knot/semantic_check_data/no_error_wildcard_glue.zone
diff --git a/tests/semantic_check_data/no_rrsig.signed b/tests/knot/semantic_check_data/no_rrsig.signed
similarity index 100%
rename from tests/semantic_check_data/no_rrsig.signed
rename to tests/knot/semantic_check_data/no_rrsig.signed
diff --git a/tests/semantic_check_data/no_rrsig_with_delegation.signed b/tests/knot/semantic_check_data/no_rrsig_with_delegation.signed
similarity index 100%
rename from tests/semantic_check_data/no_rrsig_with_delegation.signed
rename to tests/knot/semantic_check_data/no_rrsig_with_delegation.signed
diff --git a/tests/semantic_check_data/nsec3_chain_01.signed b/tests/knot/semantic_check_data/nsec3_chain_01.signed
similarity index 100%
rename from tests/semantic_check_data/nsec3_chain_01.signed
rename to tests/knot/semantic_check_data/nsec3_chain_01.signed
diff --git a/tests/semantic_check_data/nsec3_chain_02.signed b/tests/knot/semantic_check_data/nsec3_chain_02.signed
similarity index 100%
rename from tests/semantic_check_data/nsec3_chain_02.signed
rename to tests/knot/semantic_check_data/nsec3_chain_02.signed
diff --git a/tests/semantic_check_data/nsec3_chain_03.signed b/tests/knot/semantic_check_data/nsec3_chain_03.signed
similarity index 100%
rename from tests/semantic_check_data/nsec3_chain_03.signed
rename to tests/knot/semantic_check_data/nsec3_chain_03.signed
diff --git a/tests/semantic_check_data/nsec3_ds.signed b/tests/knot/semantic_check_data/nsec3_ds.signed
similarity index 100%
rename from tests/semantic_check_data/nsec3_ds.signed
rename to tests/knot/semantic_check_data/nsec3_ds.signed
diff --git a/tests/semantic_check_data/nsec3_missing.signed b/tests/knot/semantic_check_data/nsec3_missing.signed
similarity index 100%
rename from tests/semantic_check_data/nsec3_missing.signed
rename to tests/knot/semantic_check_data/nsec3_missing.signed
diff --git a/tests/semantic_check_data/nsec3_optout.signed b/tests/knot/semantic_check_data/nsec3_optout.signed
similarity index 100%
rename from tests/semantic_check_data/nsec3_optout.signed
rename to tests/knot/semantic_check_data/nsec3_optout.signed
diff --git a/tests/semantic_check_data/nsec3_param_invalid.signed b/tests/knot/semantic_check_data/nsec3_param_invalid.signed
similarity index 100%
rename from tests/semantic_check_data/nsec3_param_invalid.signed
rename to tests/knot/semantic_check_data/nsec3_param_invalid.signed
diff --git a/tests/semantic_check_data/nsec3_wrong_bitmap_01.signed b/tests/knot/semantic_check_data/nsec3_wrong_bitmap_01.signed
similarity index 100%
rename from tests/semantic_check_data/nsec3_wrong_bitmap_01.signed
rename to tests/knot/semantic_check_data/nsec3_wrong_bitmap_01.signed
diff --git a/tests/semantic_check_data/nsec3_wrong_bitmap_02.signed b/tests/knot/semantic_check_data/nsec3_wrong_bitmap_02.signed
similarity index 100%
rename from tests/semantic_check_data/nsec3_wrong_bitmap_02.signed
rename to tests/knot/semantic_check_data/nsec3_wrong_bitmap_02.signed
diff --git a/tests/semantic_check_data/nsec_broken_chain_01.signed b/tests/knot/semantic_check_data/nsec_broken_chain_01.signed
similarity index 100%
rename from tests/semantic_check_data/nsec_broken_chain_01.signed
rename to tests/knot/semantic_check_data/nsec_broken_chain_01.signed
diff --git a/tests/semantic_check_data/nsec_broken_chain_02.signed b/tests/knot/semantic_check_data/nsec_broken_chain_02.signed
similarity index 100%
rename from tests/semantic_check_data/nsec_broken_chain_02.signed
rename to tests/knot/semantic_check_data/nsec_broken_chain_02.signed
diff --git a/tests/semantic_check_data/nsec_missing.signed b/tests/knot/semantic_check_data/nsec_missing.signed
similarity index 100%
rename from tests/semantic_check_data/nsec_missing.signed
rename to tests/knot/semantic_check_data/nsec_missing.signed
diff --git a/tests/semantic_check_data/nsec_multiple.signed b/tests/knot/semantic_check_data/nsec_multiple.signed
similarity index 100%
rename from tests/semantic_check_data/nsec_multiple.signed
rename to tests/knot/semantic_check_data/nsec_multiple.signed
diff --git a/tests/semantic_check_data/nsec_wrong_bitmap_01.signed b/tests/knot/semantic_check_data/nsec_wrong_bitmap_01.signed
similarity index 100%
rename from tests/semantic_check_data/nsec_wrong_bitmap_01.signed
rename to tests/knot/semantic_check_data/nsec_wrong_bitmap_01.signed
diff --git a/tests/semantic_check_data/nsec_wrong_bitmap_02.signed b/tests/knot/semantic_check_data/nsec_wrong_bitmap_02.signed
similarity index 100%
rename from tests/semantic_check_data/nsec_wrong_bitmap_02.signed
rename to tests/knot/semantic_check_data/nsec_wrong_bitmap_02.signed
diff --git a/tests/semantic_check_data/rrsig_rdata_ttl.signed b/tests/knot/semantic_check_data/rrsig_rdata_ttl.signed
similarity index 100%
rename from tests/semantic_check_data/rrsig_rdata_ttl.signed
rename to tests/knot/semantic_check_data/rrsig_rdata_ttl.signed
diff --git a/tests/semantic_check_data/rrsig_signed.signed b/tests/knot/semantic_check_data/rrsig_signed.signed
similarity index 100%
rename from tests/semantic_check_data/rrsig_signed.signed
rename to tests/knot/semantic_check_data/rrsig_signed.signed
diff --git a/tests/semantic_check_data/rrsig_ttl.signed b/tests/knot/semantic_check_data/rrsig_ttl.signed
similarity index 100%
rename from tests/semantic_check_data/rrsig_ttl.signed
rename to tests/knot/semantic_check_data/rrsig_ttl.signed
diff --git a/tests/test_acl.c b/tests/knot/test_acl.c
similarity index 100%
rename from tests/test_acl.c
rename to tests/knot/test_acl.c
diff --git a/tests/test_changeset.c b/tests/knot/test_changeset.c
similarity index 100%
rename from tests/test_changeset.c
rename to tests/knot/test_changeset.c
diff --git a/tests/test_conf.c b/tests/knot/test_conf.c
similarity index 100%
rename from tests/test_conf.c
rename to tests/knot/test_conf.c
diff --git a/tests/test_conf.h b/tests/knot/test_conf.h
similarity index 100%
rename from tests/test_conf.h
rename to tests/knot/test_conf.h
diff --git a/tests/test_conf_tools.c b/tests/knot/test_conf_tools.c
similarity index 100%
rename from tests/test_conf_tools.c
rename to tests/knot/test_conf_tools.c
diff --git a/tests/test_confdb.c b/tests/knot/test_confdb.c
similarity index 100%
rename from tests/test_confdb.c
rename to tests/knot/test_confdb.c
diff --git a/tests/test_confio.c b/tests/knot/test_confio.c
similarity index 100%
rename from tests/test_confio.c
rename to tests/knot/test_confio.c
diff --git a/tests/test_dthreads.c b/tests/knot/test_dthreads.c
similarity index 100%
rename from tests/test_dthreads.c
rename to tests/knot/test_dthreads.c
diff --git a/tests/test_fdset.c b/tests/knot/test_fdset.c
similarity index 100%
rename from tests/test_fdset.c
rename to tests/knot/test_fdset.c
diff --git a/tests/test_journal.c b/tests/knot/test_journal.c
similarity index 100%
rename from tests/test_journal.c
rename to tests/knot/test_journal.c
diff --git a/tests/test_kasp_db.c b/tests/knot/test_kasp_db.c
similarity index 100%
rename from tests/test_kasp_db.c
rename to tests/knot/test_kasp_db.c
diff --git a/tests/test_node.c b/tests/knot/test_node.c
similarity index 100%
rename from tests/test_node.c
rename to tests/knot/test_node.c
diff --git a/tests/test_process_query.c b/tests/knot/test_process_query.c
similarity index 100%
rename from tests/test_process_query.c
rename to tests/knot/test_process_query.c
diff --git a/tests/test_query_module.c b/tests/knot/test_query_module.c
similarity index 100%
rename from tests/test_query_module.c
rename to tests/knot/test_query_module.c
diff --git a/tests/test_requestor.c b/tests/knot/test_requestor.c
similarity index 100%
rename from tests/test_requestor.c
rename to tests/knot/test_requestor.c
diff --git a/tests/test_semantic_check.in b/tests/knot/test_semantic_check.in
similarity index 99%
rename from tests/test_semantic_check.in
rename to tests/knot/test_semantic_check.in
index 19e5f4173f..9a769e1b86 100644
--- a/tests/test_semantic_check.in
+++ b/tests/knot/test_semantic_check.in
@@ -1,7 +1,7 @@
#!/bin/sh
KZONECHECK="@top_builddir@/src/kzonecheck"
-DATA="@top_srcdir@/tests/semantic_check_data"
+DATA="@top_srcdir@/tests/knot/semantic_check_data"
. "@top_srcdir@/libtap/tap/libtap.sh"
diff --git a/tests/test_server.c b/tests/knot/test_server.c
similarity index 100%
rename from tests/test_server.c
rename to tests/knot/test_server.c
diff --git a/tests/test_server.h b/tests/knot/test_server.h
similarity index 100%
rename from tests/test_server.h
rename to tests/knot/test_server.h
diff --git a/tests/test_worker_pool.c b/tests/knot/test_worker_pool.c
similarity index 100%
rename from tests/test_worker_pool.c
rename to tests/knot/test_worker_pool.c
diff --git a/tests/test_worker_queue.c b/tests/knot/test_worker_queue.c
similarity index 100%
rename from tests/test_worker_queue.c
rename to tests/knot/test_worker_queue.c
diff --git a/tests/test_zone-tree.c b/tests/knot/test_zone-tree.c
similarity index 100%
rename from tests/test_zone-tree.c
rename to tests/knot/test_zone-tree.c
diff --git a/tests/test_zone-update.c b/tests/knot/test_zone-update.c
similarity index 100%
rename from tests/test_zone-update.c
rename to tests/knot/test_zone-update.c
diff --git a/tests/test_zone_events.c b/tests/knot/test_zone_events.c
similarity index 100%
rename from tests/test_zone_events.c
rename to tests/knot/test_zone_events.c
diff --git a/tests/test_zone_serial.c b/tests/knot/test_zone_serial.c
similarity index 100%
rename from tests/test_zone_serial.c
rename to tests/knot/test_zone_serial.c
diff --git a/tests/test_zone_timers.c b/tests/knot/test_zone_timers.c
similarity index 100%
rename from tests/test_zone_timers.c
rename to tests/knot/test_zone_timers.c
diff --git a/tests/test_zonedb.c b/tests/knot/test_zonedb.c
similarity index 100%
rename from tests/test_zonedb.c
rename to tests/knot/test_zonedb.c
diff --git a/tests/semantic_check_data/Makefile.inc b/tests/semantic_check_data/Makefile.inc
deleted file mode 100644
index 35408e81fe..0000000000
--- a/tests/semantic_check_data/Makefile.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-check_SCRIPTS = \
- test_semantic_check
-
-CLEANFILES += $(check_SCRIPTS)
-
-edit = $(SED) \
- -e 's|@top_srcdir[@]|$(abs_top_srcdir)|g' \
- -e 's|@top_builddir[@]|$(abs_top_builddir)|g'
-
-test_semantic_check: $(top_srcdir)/tests/test_semantic_check.in
- @$(edit) < $(top_srcdir)/tests/test_semantic_check.in > $(top_builddir)/tests/test_semantic_check
- @chmod +x $(top_builddir)/tests/test_semantic_check
-
-EXTRA_DIST = \
- test_semantic_check.in \
- semantic_check_data
--
GitLab