From: Daniel Salzman Date: Mon, 12 Mar 2018 10:16:20 +0000 (+0100) Subject: zscanner: move to libzscanner X-Git-Tag: v2.7.0~164 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bddf37934cb30bd2a262e4cec94f849b7bf4263;p=thirdparty%2Fknot-dns.git zscanner: move to libzscanner --- diff --git a/.gitignore b/.gitignore index 037ede74da..583b7b531b 100644 --- a/.gitignore +++ b/.gitignore @@ -17,8 +17,8 @@ /Makefile.in /src/Makefile /src/Makefile.in -/src/zscanner/Makefile -/src/zscanner/Makefile.in +/src/libzscanner/Makefile +/src/libzscanner/Makefile.in /python/Makefile /python/Makefile.in /samples/Makefile @@ -66,9 +66,9 @@ /src/contrib/dnstap/dnstap.pb-c.h # zscanner -/src/zscanner/libzscanner.pc -/src/zscanner/scanner.c -/src/zscanner/version.h +/src/libzscanner/libzscanner.pc +/src/libzscanner/scanner.c +/src/libzscanner/version.h # Binaries /src/kdig diff --git a/Doxyfile.in b/Doxyfile.in index 20ce400c8d..e58b047ccf 100644 --- a/Doxyfile.in +++ b/Doxyfile.in @@ -784,7 +784,7 @@ WARN_LOGFILE = doc/html/doxygen.warn INPUT = Doxy.page.h \ src/libdnssec \ src/libknot \ - src/zscanner \ + src/libzscanner \ src/knot/include # This tag can be used to specify the character encoding of the source files diff --git a/Knot.files b/Knot.files index 0c3a6cb782..fb4a318b1e 100644 --- a/Knot.files +++ b/Knot.files @@ -359,6 +359,13 @@ src/libknot/yparser/ypschema.c src/libknot/yparser/ypschema.h src/libknot/yparser/yptrafo.c src/libknot/yparser/yptrafo.h +src/libzscanner/error.c +src/libzscanner/error.h +src/libzscanner/functions.c +src/libzscanner/functions.h +src/libzscanner/scanner.h +src/libzscanner/scanner.rl +src/libzscanner/scanner_body.rl src/utils/common/cert.c src/utils/common/cert.h src/utils/common/exec.c @@ -414,13 +421,6 @@ src/utils/knsupdate/knsupdate_params.h src/utils/kzonecheck/main.c src/utils/kzonecheck/zone_check.c src/utils/kzonecheck/zone_check.h -src/zscanner/error.c -src/zscanner/error.h -src/zscanner/functions.c -src/zscanner/functions.h -src/zscanner/scanner.h -src/zscanner/scanner.rl -src/zscanner/scanner_body.rl tests-fuzz/fuzz_packet.c tests-fuzz/fuzz_zscanner.c tests-fuzz/knotd_wrap/afl-loop.h @@ -513,10 +513,10 @@ tests/libknot/test_wire.c tests/libknot/test_yparser.c tests/libknot/test_ypschema.c tests/libknot/test_yptrafo.c +tests/libzscanner/processing.c +tests/libzscanner/processing.h +tests/libzscanner/zscanner-tool.c tests/modules/test_onlinesign.c tests/modules/test_rrl.c tests/utils/test_cert.c tests/utils/test_lookup.c -tests/zscanner/processing.c -tests/zscanner/processing.h -tests/zscanner/zscanner-tool.c diff --git a/Knot.includes b/Knot.includes index db61e00f34..7b61db7ba4 100644 --- a/Knot.includes +++ b/Knot.includes @@ -2,7 +2,7 @@ src src/contrib src/libdnssec src/libdnssec/shared -src/zscanner +src/libzscanner tests tests-fuzz tests-fuzz/knotd_wrap diff --git a/Makefile.am b/Makefile.am index 7b8fd3e36b..823176eeec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,10 +17,10 @@ CODE_COVERAGE_INFO = coverage.info CODE_COVERAGE_HTML = coverage.html CODE_COVERAGE_DIRS = \ src/contrib \ - src/libdnssec \ src/knot \ + src/libdnssec \ src/libknot \ - src/zscanner + src/libzscanner code_coverage_quiet = --quiet diff --git a/configure.ac b/configure.ac index 00ac470f93..e29c7e8e92 100644 --- a/configure.ac +++ b/configure.ac @@ -24,8 +24,8 @@ AC_SUBST([KNOT_VERSION_PATCH], knot_VERSION_PATCH) AC_SUBST([KNOT_VERSION_EXTRA], knot_VERSION_EXTRA) AC_CONFIG_FILES([src/libknot/version.h - src/zscanner/version.h - src/libdnssec/version.h]) + src/libdnssec/version.h + src/libzscanner/version.h]) # Store ./configure parameters into macro AC_DEFINE_UNQUOTED([CONFIGURE_PARAMS],["$configure_params"],[Params passed to configure]) @@ -62,7 +62,7 @@ m4_ifdef([PKG_INSTALLDIR], [PKG_INSTALLDIR], [AC_SUBST([pkgconfigdir], ['${libdi AC_CONFIG_FILES([src/knotd.pc src/libknot.pc src/libdnssec/libdnssec.pc - src/zscanner/libzscanner.pc + src/libzscanner/libzscanner.pc ]) # Build Knot DNS daemon @@ -588,9 +588,9 @@ AC_CONFIG_FILES([Makefile python/Makefile src/Makefile src/contrib/dnstap/Makefile - src/libdnssec/Makefile src/knot/modules/static_modules.h - src/zscanner/Makefile + src/libdnssec/Makefile + src/libzscanner/Makefile ]) AC_CONFIG_FILES([src/utils/pykeymgr/pykeymgr], [chmod +x src/utils/pykeymgr/pykeymgr]) diff --git a/scripts/update-parser.sh b/scripts/update-parser.sh index e222caba39..665d311ba6 100755 --- a/scripts/update-parser.sh +++ b/scripts/update-parser.sh @@ -6,7 +6,7 @@ IN="./scanner.rl" OUT_T0="./scanner.c.t0" OUT_G2="./scanner.c.g2" -pushd ../src/zscanner/ +pushd ../src/libzscanner/ # Generate slower/small zone parser. ragel -T0 -s -o $OUT_T0 $IN diff --git a/src/Makefile.am b/src/Makefile.am index d8b02dfc4e..4559b0520c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ ACLOCAL_AMFLAGS = -I $(top_srcdir)/m4 -SUBDIRS = zscanner libdnssec contrib/dnstap . +SUBDIRS = libzscanner libdnssec contrib/dnstap . lib_LTLIBRARIES = \ libknot.la @@ -364,7 +364,7 @@ libknotd_la_SOURCES = \ libknotd_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAG_VISIBILITY) $(systemd_CFLAGS) \ $(liburcu_CFLAGS) -DKNOTD_MOD_STATIC libknotd_la_LDFLAGS = $(AM_LDFLAGS) -export-symbols-regex '^knotd_' -libknotd_la_LIBADD = libknot.la zscanner/libzscanner.la $(systemd_LIBS) \ +libknotd_la_LIBADD = libknot.la libzscanner/libzscanner.la $(systemd_LIBS) \ $(liburcu_LIBS) ################### @@ -411,7 +411,7 @@ knotc_LDADD = libknotd.la libcontrib.la libknotus.la $(libedit_LIBS) knotc_LDFLAGS = $(AM_LDFLAGS) -rdynamic keymgr_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libdnssec $(gnutls_CFLAGS) keymgr_LDADD = libknotd.la libcontrib.la libknotus.la libdnssec/libdnssec.la \ - libdnssec/libshared.la zscanner/libzscanner.la + libdnssec/libshared.la libzscanner/libzscanner.la #################################### # Optional Knot DNS Daemon modules # @@ -476,7 +476,7 @@ kdig_LDADD = libknotus.la khost_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS) khost_LDADD = libknotus.la knsupdate_CPPFLAGS = $(AM_CPPFLAGS) $(gnutls_CFLAGS) -knsupdate_LDADD = libknotus.la zscanner/libzscanner.la +knsupdate_LDADD = libknotus.la libzscanner/libzscanner.la knsec3hash_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/libdnssec knsec3hash_LDADD = libknot.la libcontrib.la libdnssec/libdnssec.la libdnssec/libshared.la kzonecheck_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/src/knot/ctl/commands.c b/src/knot/ctl/commands.c index 8f40557db5..910789fa72 100644 --- a/src/knot/ctl/commands.c +++ b/src/knot/ctl/commands.c @@ -35,7 +35,7 @@ #include "contrib/mempattern.h" #include "contrib/string.h" #include "contrib/ucw/lists.h" -#include "zscanner/scanner.h" +#include "libzscanner/scanner.h" #include "contrib/strtonum.h" #define MATCH_OR_FILTER(args, code) ((args)->data[KNOT_CTL_IDX_FILTER] == NULL || \ diff --git a/src/knot/zone/zonefile.h b/src/knot/zone/zonefile.h index ef89b1dd21..9b18576847 100644 --- a/src/knot/zone/zonefile.h +++ b/src/knot/zone/zonefile.h @@ -21,7 +21,7 @@ #include "knot/zone/zone.h" #include "knot/zone/semantic-check.h" -#include "zscanner/scanner.h" +#include "libzscanner/scanner.h" /*! * \brief Zone creator structure. */ diff --git a/src/zscanner/Makefile.am b/src/libzscanner/Makefile.am similarity index 100% rename from src/zscanner/Makefile.am rename to src/libzscanner/Makefile.am diff --git a/src/zscanner/NOTES b/src/libzscanner/NOTES similarity index 100% rename from src/zscanner/NOTES rename to src/libzscanner/NOTES diff --git a/src/zscanner/error.c b/src/libzscanner/error.c similarity index 99% rename from src/zscanner/error.c rename to src/libzscanner/error.c index e42d8771c6..f658f5b79e 100644 --- a/src/zscanner/error.c +++ b/src/libzscanner/error.c @@ -16,7 +16,7 @@ #include -#include "zscanner/error.h" +#include "libzscanner/error.h" typedef struct { int code; diff --git a/src/zscanner/error.h b/src/libzscanner/error.h similarity index 100% rename from src/zscanner/error.h rename to src/libzscanner/error.h diff --git a/src/zscanner/functions.c b/src/libzscanner/functions.c similarity index 99% rename from src/zscanner/functions.c rename to src/libzscanner/functions.c index ea4a099664..60610763d7 100644 --- a/src/zscanner/functions.c +++ b/src/libzscanner/functions.c @@ -17,8 +17,8 @@ #include #include -#include "zscanner/error.h" -#include "zscanner/functions.h" +#include "libzscanner/error.h" +#include "libzscanner/functions.h" const uint8_t digit_to_num[] = { ['0'] = 0, ['1'] = 1, ['2'] = 2, ['3'] = 3, ['4'] = 4, diff --git a/src/zscanner/functions.h b/src/libzscanner/functions.h similarity index 100% rename from src/zscanner/functions.h rename to src/libzscanner/functions.h diff --git a/src/zscanner/libzscanner.pc.in b/src/libzscanner/libzscanner.pc.in similarity index 100% rename from src/zscanner/libzscanner.pc.in rename to src/libzscanner/libzscanner.pc.in diff --git a/src/zscanner/scanner.c.g2 b/src/libzscanner/scanner.c.g2 similarity index 99% rename from src/zscanner/scanner.c.g2 rename to src/libzscanner/scanner.c.g2 index 37cfe99df8..1a0b6cd5f4 100644 --- a/src/zscanner/scanner.c.g2 +++ b/src/libzscanner/scanner.c.g2 @@ -31,8 +31,8 @@ #include #include -#include "zscanner/scanner.h" -#include "zscanner/functions.h" +#include "libzscanner/scanner.h" +#include "libzscanner/functions.h" #include "libknot/descriptor.h" /*! \brief Maximal length of rdata item. */ diff --git a/src/zscanner/scanner.c.t0 b/src/libzscanner/scanner.c.t0 similarity index 99% rename from src/zscanner/scanner.c.t0 rename to src/libzscanner/scanner.c.t0 index a1f03476d0..52af28bd48 100644 --- a/src/zscanner/scanner.c.t0 +++ b/src/libzscanner/scanner.c.t0 @@ -31,8 +31,8 @@ #include #include -#include "zscanner/scanner.h" -#include "zscanner/functions.h" +#include "libzscanner/scanner.h" +#include "libzscanner/functions.h" #include "libknot/descriptor.h" /*! \brief Maximal length of rdata item. */ diff --git a/src/zscanner/scanner.h b/src/libzscanner/scanner.h similarity index 98% rename from src/zscanner/scanner.h rename to src/libzscanner/scanner.h index aa29bbdce3..8a2589183b 100644 --- a/src/zscanner/scanner.h +++ b/src/libzscanner/scanner.h @@ -28,7 +28,7 @@ #include #include -#include "zscanner/error.h" +#include "libzscanner/error.h" /*! \brief Maximal length of rdata. */ #define ZS_MAX_RDATA_LENGTH 65535 @@ -95,8 +95,8 @@ typedef enum { * - Output variables (r_ prefix) containing all parts of zone record. These * data are useful during processing via callback function. */ -typedef struct scanner zs_scanner_t; // Forward declaration due to arguments. -struct scanner { +typedef struct zs_scanner zs_scanner_t; // Forward declaration due to arguments. +struct zs_scanner { /*! Current state (Ragel internals). */ int cs; /*! Stack top (Ragel internals). */ diff --git a/src/zscanner/scanner.rl b/src/libzscanner/scanner.rl similarity index 99% rename from src/zscanner/scanner.rl rename to src/libzscanner/scanner.rl index c04cb7a0bc..e996b8a460 100644 --- a/src/zscanner/scanner.rl +++ b/src/libzscanner/scanner.rl @@ -30,8 +30,8 @@ #include #include -#include "zscanner/scanner.h" -#include "zscanner/functions.h" +#include "libzscanner/scanner.h" +#include "libzscanner/functions.h" #include "libknot/descriptor.h" /*! \brief Maximal length of rdata item. */ diff --git a/src/zscanner/scanner_body.rl b/src/libzscanner/scanner_body.rl similarity index 100% rename from src/zscanner/scanner_body.rl rename to src/libzscanner/scanner_body.rl diff --git a/src/zscanner/version.h.in b/src/libzscanner/version.h.in similarity index 100% rename from src/zscanner/version.h.in rename to src/libzscanner/version.h.in diff --git a/src/utils/keymgr/functions.c b/src/utils/keymgr/functions.c index 34a1ba68e2..51d5b14316 100644 --- a/src/utils/keymgr/functions.c +++ b/src/utils/keymgr/functions.c @@ -30,7 +30,7 @@ #include "libdnssec/shared/shared.h" #include "knot/dnssec/kasp/policy.h" #include "knot/dnssec/zone-keys.h" -#include "zscanner/scanner.h" +#include "libzscanner/scanner.h" static bool is_timestamp(char *arg, knot_kasp_key_timing_t *timing) { diff --git a/src/utils/knotc/estimator.h b/src/utils/knotc/estimator.h index 1dfb590117..63fb7fdeab 100644 --- a/src/utils/knotc/estimator.h +++ b/src/utils/knotc/estimator.h @@ -25,7 +25,7 @@ #pragma once #include "contrib/qp-trie/trie.h" -#include "zscanner/scanner.h" +#include "libzscanner/scanner.h" /*! * \brief Memory estimation context. diff --git a/src/utils/knsupdate/knsupdate_params.h b/src/utils/knsupdate/knsupdate_params.h index 7f8791f76e..da8dc28649 100644 --- a/src/utils/knsupdate/knsupdate_params.h +++ b/src/utils/knsupdate/knsupdate_params.h @@ -32,7 +32,7 @@ #include "utils/common/params.h" #include "utils/common/sign.h" #include "libknot/libknot.h" -#include "zscanner/scanner.h" +#include "libzscanner/scanner.h" #include "contrib/ucw/lists.h" /*! \brief knsupdate-specific params data. */ diff --git a/tests-fuzz/Makefile.am b/tests-fuzz/Makefile.am index ec5d5b5253..aca04fc6b9 100644 --- a/tests-fuzz/Makefile.am +++ b/tests-fuzz/Makefile.am @@ -42,7 +42,7 @@ fuzz_packet_LDADD = $(top_builddir)/src/libknot.la fuzz_zscanner_SOURCES = fuzz_zscanner.c fuzz_zscanner_CPPFLAGS = $(AM_CPPFLAGS) -fuzz_zscanner_LDADD = $(top_builddir)/src/zscanner/libzscanner.la +fuzz_zscanner_LDADD = $(top_builddir)/src/libzscanner/libzscanner.la if OSS_FUZZ diff --git a/tests-fuzz/fuzz_zscanner.c b/tests-fuzz/fuzz_zscanner.c index 4e664a37f2..cb89545812 100644 --- a/tests-fuzz/fuzz_zscanner.c +++ b/tests-fuzz/fuzz_zscanner.c @@ -16,7 +16,7 @@ #include -#include "zscanner/scanner.h" +#include "libzscanner/scanner.h" int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { diff --git a/tests/.gitignore b/tests/.gitignore index b02bdc594c..4cd0863aa1 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -16,26 +16,6 @@ /contrib/test_time /contrib/test_wire_ctx -/libdnssec/test_binary -/libdnssec/test_crypto -/libdnssec/test_key -/libdnssec/test_key_algorithm -/libdnssec/test_key_ds -/libdnssec/test_keyid -/libdnssec/test_keystore_pkcs11 -/libdnssec/test_keystore_pkcs8 -/libdnssec/test_keystore_pkcs8_dir -/libdnssec/test_keytag -/libdnssec/test_list -/libdnssec/test_nsec_bitmap -/libdnssec/test_nsec_hash -/libdnssec/test_random -/libdnssec/test_sign -/libdnssec/test_sign_der -/libdnssec/test_shared_bignum -/libdnssec/test_shared_dname -/libdnssec/test_tsig - /knot/test_acl /knot/test_changeset /knot/test_conf @@ -62,6 +42,26 @@ /knot/test_zone_timers /knot/test_zonedb +/libdnssec/test_binary +/libdnssec/test_crypto +/libdnssec/test_key +/libdnssec/test_key_algorithm +/libdnssec/test_key_ds +/libdnssec/test_keyid +/libdnssec/test_keystore_pkcs11 +/libdnssec/test_keystore_pkcs8 +/libdnssec/test_keystore_pkcs8_dir +/libdnssec/test_keytag +/libdnssec/test_list +/libdnssec/test_nsec_bitmap +/libdnssec/test_nsec_hash +/libdnssec/test_random +/libdnssec/test_sign +/libdnssec/test_sign_der +/libdnssec/test_shared_bignum +/libdnssec/test_shared_dname +/libdnssec/test_tsig + /libknot/test_control /libknot/test_cookies /libknot/test_db @@ -82,12 +82,12 @@ /libknot/test_yptrafo /libknot/test_wire +/libzscanner/tmp +/libzscanner/test_zscanner +/libzscanner/zscanner-tool + /modules/test_onlinesign /modules/test_rrl /utils/test_cert /utils/test_lookup - -/zscanner/tmp -/zscanner/test_zscanner -/zscanner/zscanner-tool diff --git a/tests/Makefile.am b/tests/Makefile.am index a58a3023b4..4a214c12fa 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -15,15 +15,15 @@ LDADD = \ $(top_builddir)/src/libknot.la \ $(top_builddir)/src/libknotd.la \ $(top_builddir)/src/libcontrib.la \ - $(top_builddir)/src/zscanner/libzscanner.la + $(top_builddir)/src/libzscanner/libzscanner.la EXTRA_DIST = \ libdnssec/sample_keys.h \ knot/semantic_check_data \ knot/test_semantic_check.in \ - zscanner/data \ - zscanner/test_zscanner.in \ - zscanner/TESTS + libzscanner/data \ + libzscanner/test_zscanner.in \ + libzscanner/TESTS check_PROGRAMS = \ contrib/test_base32hex \ @@ -154,16 +154,16 @@ utils_test_cert_LDADD = \ $(libedit_LIBS) EXTRA_PROGRAMS = \ - zscanner/zscanner-tool + libzscanner/zscanner-tool -zscanner_zscanner_tool_SOURCES = \ - zscanner/zscanner-tool.c \ - zscanner/processing.h \ - zscanner/processing.c +libzscanner_zscanner_tool_SOURCES = \ + libzscanner/zscanner-tool.c \ + libzscanner/processing.h \ + libzscanner/processing.c check_SCRIPTS = \ knot/test_semantic_check \ - zscanner/test_zscanner + libzscanner/test_zscanner edit = $(SED) \ -e 's|@top_srcdir[@]|$(abs_top_srcdir)|g' \ @@ -173,7 +173,7 @@ knot/test_semantic_check: @$(edit) < $(top_srcdir)/tests/$@.in > $(top_builddir)/tests/$@ @chmod +x $(top_builddir)/tests/$@ -zscanner/test_zscanner: zscanner/zscanner-tool +libzscanner/test_zscanner: libzscanner/zscanner-tool @$(edit) < $(top_srcdir)/tests/$@.in > $(top_builddir)/tests/$@ @chmod +x $(top_builddir)/tests/$@ diff --git a/tests/knot/test_zone-update.c b/tests/knot/test_zone-update.c index 65a372cf45..71579cf484 100644 --- a/tests/knot/test_zone-update.c +++ b/tests/knot/test_zone-update.c @@ -23,7 +23,7 @@ #include "contrib/getline.h" #include "knot/updates/zone-update.h" #include "knot/zone/node.h" -#include "zscanner/scanner.h" +#include "libzscanner/scanner.h" #include "knot/server/server.h" static const char *zone_str1 = "test. 600 IN SOA ns.test. m.test. 1 900 300 4800 900 \n"; diff --git a/tests/zscanner/TESTS b/tests/libzscanner/TESTS similarity index 100% rename from tests/zscanner/TESTS rename to tests/libzscanner/TESTS diff --git a/tests/zscanner/data/00-0_general.in b/tests/libzscanner/data/00-0_general.in similarity index 100% rename from tests/zscanner/data/00-0_general.in rename to tests/libzscanner/data/00-0_general.in diff --git a/tests/zscanner/data/00-0_general.out b/tests/libzscanner/data/00-0_general.out similarity index 100% rename from tests/zscanner/data/00-0_general.out rename to tests/libzscanner/data/00-0_general.out diff --git a/tests/zscanner/data/00-1_general.in b/tests/libzscanner/data/00-1_general.in similarity index 100% rename from tests/zscanner/data/00-1_general.in rename to tests/libzscanner/data/00-1_general.in diff --git a/tests/zscanner/data/00-1_general.out b/tests/libzscanner/data/00-1_general.out similarity index 100% rename from tests/zscanner/data/00-1_general.out rename to tests/libzscanner/data/00-1_general.out diff --git a/tests/zscanner/data/00-2_general.in b/tests/libzscanner/data/00-2_general.in similarity index 100% rename from tests/zscanner/data/00-2_general.in rename to tests/libzscanner/data/00-2_general.in diff --git a/tests/zscanner/data/00-2_general.out b/tests/libzscanner/data/00-2_general.out similarity index 100% rename from tests/zscanner/data/00-2_general.out rename to tests/libzscanner/data/00-2_general.out diff --git a/tests/zscanner/data/00-3_general.in b/tests/libzscanner/data/00-3_general.in similarity index 100% rename from tests/zscanner/data/00-3_general.in rename to tests/libzscanner/data/00-3_general.in diff --git a/tests/zscanner/data/00-3_general.out b/tests/libzscanner/data/00-3_general.out similarity index 100% rename from tests/zscanner/data/00-3_general.out rename to tests/libzscanner/data/00-3_general.out diff --git a/tests/zscanner/data/00-4_general.in b/tests/libzscanner/data/00-4_general.in similarity index 100% rename from tests/zscanner/data/00-4_general.in rename to tests/libzscanner/data/00-4_general.in diff --git a/tests/zscanner/data/00-4_general.out b/tests/libzscanner/data/00-4_general.out similarity index 100% rename from tests/zscanner/data/00-4_general.out rename to tests/libzscanner/data/00-4_general.out diff --git a/tests/zscanner/data/01_owner.in b/tests/libzscanner/data/01_owner.in similarity index 100% rename from tests/zscanner/data/01_owner.in rename to tests/libzscanner/data/01_owner.in diff --git a/tests/zscanner/data/01_owner.out b/tests/libzscanner/data/01_owner.out similarity index 100% rename from tests/zscanner/data/01_owner.out rename to tests/libzscanner/data/01_owner.out diff --git a/tests/zscanner/data/02_class.in b/tests/libzscanner/data/02_class.in similarity index 100% rename from tests/zscanner/data/02_class.in rename to tests/libzscanner/data/02_class.in diff --git a/tests/zscanner/data/02_class.out b/tests/libzscanner/data/02_class.out similarity index 100% rename from tests/zscanner/data/02_class.out rename to tests/libzscanner/data/02_class.out diff --git a/tests/zscanner/data/03_rrttl.in b/tests/libzscanner/data/03_rrttl.in similarity index 100% rename from tests/zscanner/data/03_rrttl.in rename to tests/libzscanner/data/03_rrttl.in diff --git a/tests/zscanner/data/03_rrttl.out b/tests/libzscanner/data/03_rrttl.out similarity index 100% rename from tests/zscanner/data/03_rrttl.out rename to tests/libzscanner/data/03_rrttl.out diff --git a/tests/zscanner/data/04-0_ORIGIN.in b/tests/libzscanner/data/04-0_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-0_ORIGIN.in rename to tests/libzscanner/data/04-0_ORIGIN.in diff --git a/tests/zscanner/data/04-0_ORIGIN.out b/tests/libzscanner/data/04-0_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-0_ORIGIN.out rename to tests/libzscanner/data/04-0_ORIGIN.out diff --git a/tests/zscanner/data/04-1_ORIGIN.in b/tests/libzscanner/data/04-1_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-1_ORIGIN.in rename to tests/libzscanner/data/04-1_ORIGIN.in diff --git a/tests/zscanner/data/04-1_ORIGIN.out b/tests/libzscanner/data/04-1_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-1_ORIGIN.out rename to tests/libzscanner/data/04-1_ORIGIN.out diff --git a/tests/zscanner/data/04-2_ORIGIN.in b/tests/libzscanner/data/04-2_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-2_ORIGIN.in rename to tests/libzscanner/data/04-2_ORIGIN.in diff --git a/tests/zscanner/data/04-2_ORIGIN.out b/tests/libzscanner/data/04-2_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-2_ORIGIN.out rename to tests/libzscanner/data/04-2_ORIGIN.out diff --git a/tests/zscanner/data/04-3_ORIGIN.in b/tests/libzscanner/data/04-3_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-3_ORIGIN.in rename to tests/libzscanner/data/04-3_ORIGIN.in diff --git a/tests/zscanner/data/04-3_ORIGIN.out b/tests/libzscanner/data/04-3_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-3_ORIGIN.out rename to tests/libzscanner/data/04-3_ORIGIN.out diff --git a/tests/zscanner/data/04-4_ORIGIN.in b/tests/libzscanner/data/04-4_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-4_ORIGIN.in rename to tests/libzscanner/data/04-4_ORIGIN.in diff --git a/tests/zscanner/data/04-4_ORIGIN.out b/tests/libzscanner/data/04-4_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-4_ORIGIN.out rename to tests/libzscanner/data/04-4_ORIGIN.out diff --git a/tests/zscanner/data/04-5_ORIGIN.in b/tests/libzscanner/data/04-5_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-5_ORIGIN.in rename to tests/libzscanner/data/04-5_ORIGIN.in diff --git a/tests/zscanner/data/04-5_ORIGIN.out b/tests/libzscanner/data/04-5_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-5_ORIGIN.out rename to tests/libzscanner/data/04-5_ORIGIN.out diff --git a/tests/zscanner/data/04-6_ORIGIN.in b/tests/libzscanner/data/04-6_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-6_ORIGIN.in rename to tests/libzscanner/data/04-6_ORIGIN.in diff --git a/tests/zscanner/data/04-6_ORIGIN.out b/tests/libzscanner/data/04-6_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-6_ORIGIN.out rename to tests/libzscanner/data/04-6_ORIGIN.out diff --git a/tests/zscanner/data/04-7_ORIGIN.in b/tests/libzscanner/data/04-7_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-7_ORIGIN.in rename to tests/libzscanner/data/04-7_ORIGIN.in diff --git a/tests/zscanner/data/04-7_ORIGIN.out b/tests/libzscanner/data/04-7_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-7_ORIGIN.out rename to tests/libzscanner/data/04-7_ORIGIN.out diff --git a/tests/zscanner/data/04-8_ORIGIN.in b/tests/libzscanner/data/04-8_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-8_ORIGIN.in rename to tests/libzscanner/data/04-8_ORIGIN.in diff --git a/tests/zscanner/data/04-8_ORIGIN.out b/tests/libzscanner/data/04-8_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-8_ORIGIN.out rename to tests/libzscanner/data/04-8_ORIGIN.out diff --git a/tests/zscanner/data/04-9_ORIGIN.in b/tests/libzscanner/data/04-9_ORIGIN.in similarity index 100% rename from tests/zscanner/data/04-9_ORIGIN.in rename to tests/libzscanner/data/04-9_ORIGIN.in diff --git a/tests/zscanner/data/04-9_ORIGIN.out b/tests/libzscanner/data/04-9_ORIGIN.out similarity index 100% rename from tests/zscanner/data/04-9_ORIGIN.out rename to tests/libzscanner/data/04-9_ORIGIN.out diff --git a/tests/zscanner/data/05-0_TTL.in b/tests/libzscanner/data/05-0_TTL.in similarity index 100% rename from tests/zscanner/data/05-0_TTL.in rename to tests/libzscanner/data/05-0_TTL.in diff --git a/tests/zscanner/data/05-0_TTL.out b/tests/libzscanner/data/05-0_TTL.out similarity index 100% rename from tests/zscanner/data/05-0_TTL.out rename to tests/libzscanner/data/05-0_TTL.out diff --git a/tests/zscanner/data/05-1_TTL.in b/tests/libzscanner/data/05-1_TTL.in similarity index 100% rename from tests/zscanner/data/05-1_TTL.in rename to tests/libzscanner/data/05-1_TTL.in diff --git a/tests/zscanner/data/05-1_TTL.out b/tests/libzscanner/data/05-1_TTL.out similarity index 100% rename from tests/zscanner/data/05-1_TTL.out rename to tests/libzscanner/data/05-1_TTL.out diff --git a/tests/zscanner/data/05-2_TTL.in b/tests/libzscanner/data/05-2_TTL.in similarity index 100% rename from tests/zscanner/data/05-2_TTL.in rename to tests/libzscanner/data/05-2_TTL.in diff --git a/tests/zscanner/data/05-2_TTL.out b/tests/libzscanner/data/05-2_TTL.out similarity index 100% rename from tests/zscanner/data/05-2_TTL.out rename to tests/libzscanner/data/05-2_TTL.out diff --git a/tests/zscanner/data/05-3_TTL.in b/tests/libzscanner/data/05-3_TTL.in similarity index 100% rename from tests/zscanner/data/05-3_TTL.in rename to tests/libzscanner/data/05-3_TTL.in diff --git a/tests/zscanner/data/05-3_TTL.out b/tests/libzscanner/data/05-3_TTL.out similarity index 100% rename from tests/zscanner/data/05-3_TTL.out rename to tests/libzscanner/data/05-3_TTL.out diff --git a/tests/zscanner/data/05-4_TTL.in b/tests/libzscanner/data/05-4_TTL.in similarity index 100% rename from tests/zscanner/data/05-4_TTL.in rename to tests/libzscanner/data/05-4_TTL.in diff --git a/tests/zscanner/data/05-4_TTL.out b/tests/libzscanner/data/05-4_TTL.out similarity index 100% rename from tests/zscanner/data/05-4_TTL.out rename to tests/libzscanner/data/05-4_TTL.out diff --git a/tests/zscanner/data/06-0_INCLUDE.in b/tests/libzscanner/data/06-0_INCLUDE.in similarity index 100% rename from tests/zscanner/data/06-0_INCLUDE.in rename to tests/libzscanner/data/06-0_INCLUDE.in diff --git a/tests/zscanner/data/06-0_INCLUDE.out b/tests/libzscanner/data/06-0_INCLUDE.out similarity index 100% rename from tests/zscanner/data/06-0_INCLUDE.out rename to tests/libzscanner/data/06-0_INCLUDE.out diff --git a/tests/zscanner/data/06-1_INCLUDE.in b/tests/libzscanner/data/06-1_INCLUDE.in similarity index 100% rename from tests/zscanner/data/06-1_INCLUDE.in rename to tests/libzscanner/data/06-1_INCLUDE.in diff --git a/tests/zscanner/data/06-1_INCLUDE.out b/tests/libzscanner/data/06-1_INCLUDE.out similarity index 100% rename from tests/zscanner/data/06-1_INCLUDE.out rename to tests/libzscanner/data/06-1_INCLUDE.out diff --git a/tests/zscanner/data/06-2_INCLUDE.in b/tests/libzscanner/data/06-2_INCLUDE.in similarity index 100% rename from tests/zscanner/data/06-2_INCLUDE.in rename to tests/libzscanner/data/06-2_INCLUDE.in diff --git a/tests/zscanner/data/06-2_INCLUDE.out b/tests/libzscanner/data/06-2_INCLUDE.out similarity index 100% rename from tests/zscanner/data/06-2_INCLUDE.out rename to tests/libzscanner/data/06-2_INCLUDE.out diff --git a/tests/zscanner/data/06-3_INCLUDE.in b/tests/libzscanner/data/06-3_INCLUDE.in similarity index 100% rename from tests/zscanner/data/06-3_INCLUDE.in rename to tests/libzscanner/data/06-3_INCLUDE.in diff --git a/tests/zscanner/data/06-3_INCLUDE.out b/tests/libzscanner/data/06-3_INCLUDE.out similarity index 100% rename from tests/zscanner/data/06-3_INCLUDE.out rename to tests/libzscanner/data/06-3_INCLUDE.out diff --git a/tests/zscanner/data/06-4_INCLUDE.in b/tests/libzscanner/data/06-4_INCLUDE.in similarity index 100% rename from tests/zscanner/data/06-4_INCLUDE.in rename to tests/libzscanner/data/06-4_INCLUDE.in diff --git a/tests/zscanner/data/06-4_INCLUDE.out b/tests/libzscanner/data/06-4_INCLUDE.out similarity index 100% rename from tests/zscanner/data/06-4_INCLUDE.out rename to tests/libzscanner/data/06-4_INCLUDE.out diff --git a/tests/zscanner/data/06-5_INCLUDE.in b/tests/libzscanner/data/06-5_INCLUDE.in similarity index 100% rename from tests/zscanner/data/06-5_INCLUDE.in rename to tests/libzscanner/data/06-5_INCLUDE.in diff --git a/tests/zscanner/data/06-5_INCLUDE.out b/tests/libzscanner/data/06-5_INCLUDE.out similarity index 100% rename from tests/zscanner/data/06-5_INCLUDE.out rename to tests/libzscanner/data/06-5_INCLUDE.out diff --git a/tests/zscanner/data/06-6_INCLUDE.in b/tests/libzscanner/data/06-6_INCLUDE.in similarity index 100% rename from tests/zscanner/data/06-6_INCLUDE.in rename to tests/libzscanner/data/06-6_INCLUDE.in diff --git a/tests/zscanner/data/06-6_INCLUDE.out b/tests/libzscanner/data/06-6_INCLUDE.out similarity index 100% rename from tests/zscanner/data/06-6_INCLUDE.out rename to tests/libzscanner/data/06-6_INCLUDE.out diff --git a/tests/zscanner/data/06-7_INCLUDE.in b/tests/libzscanner/data/06-7_INCLUDE.in similarity index 100% rename from tests/zscanner/data/06-7_INCLUDE.in rename to tests/libzscanner/data/06-7_INCLUDE.in diff --git a/tests/zscanner/data/06-7_INCLUDE.out b/tests/libzscanner/data/06-7_INCLUDE.out similarity index 100% rename from tests/zscanner/data/06-7_INCLUDE.out rename to tests/libzscanner/data/06-7_INCLUDE.out diff --git a/tests/zscanner/data/06-8_INCLUDE.in b/tests/libzscanner/data/06-8_INCLUDE.in similarity index 100% rename from tests/zscanner/data/06-8_INCLUDE.in rename to tests/libzscanner/data/06-8_INCLUDE.in diff --git a/tests/zscanner/data/06-8_INCLUDE.out b/tests/libzscanner/data/06-8_INCLUDE.out similarity index 100% rename from tests/zscanner/data/06-8_INCLUDE.out rename to tests/libzscanner/data/06-8_INCLUDE.out diff --git a/tests/zscanner/data/07-0-rdata.in b/tests/libzscanner/data/07-0-rdata.in similarity index 100% rename from tests/zscanner/data/07-0-rdata.in rename to tests/libzscanner/data/07-0-rdata.in diff --git a/tests/zscanner/data/07-0-rdata.out b/tests/libzscanner/data/07-0-rdata.out similarity index 100% rename from tests/zscanner/data/07-0-rdata.out rename to tests/libzscanner/data/07-0-rdata.out diff --git a/tests/zscanner/data/07-1-rdata.in b/tests/libzscanner/data/07-1-rdata.in similarity index 100% rename from tests/zscanner/data/07-1-rdata.in rename to tests/libzscanner/data/07-1-rdata.in diff --git a/tests/zscanner/data/07-1-rdata.out b/tests/libzscanner/data/07-1-rdata.out similarity index 100% rename from tests/zscanner/data/07-1-rdata.out rename to tests/libzscanner/data/07-1-rdata.out diff --git a/tests/zscanner/data/07-2-rdata.in b/tests/libzscanner/data/07-2-rdata.in similarity index 100% rename from tests/zscanner/data/07-2-rdata.in rename to tests/libzscanner/data/07-2-rdata.in diff --git a/tests/zscanner/data/07-2-rdata.out b/tests/libzscanner/data/07-2-rdata.out similarity index 100% rename from tests/zscanner/data/07-2-rdata.out rename to tests/libzscanner/data/07-2-rdata.out diff --git a/tests/zscanner/data/07-3-rdata.in b/tests/libzscanner/data/07-3-rdata.in similarity index 100% rename from tests/zscanner/data/07-3-rdata.in rename to tests/libzscanner/data/07-3-rdata.in diff --git a/tests/zscanner/data/07-3-rdata.out b/tests/libzscanner/data/07-3-rdata.out similarity index 100% rename from tests/zscanner/data/07-3-rdata.out rename to tests/libzscanner/data/07-3-rdata.out diff --git a/tests/zscanner/data/07-4-rdata.in b/tests/libzscanner/data/07-4-rdata.in similarity index 100% rename from tests/zscanner/data/07-4-rdata.in rename to tests/libzscanner/data/07-4-rdata.in diff --git a/tests/zscanner/data/07-4-rdata.out b/tests/libzscanner/data/07-4-rdata.out similarity index 100% rename from tests/zscanner/data/07-4-rdata.out rename to tests/libzscanner/data/07-4-rdata.out diff --git a/tests/zscanner/data/10_A.in b/tests/libzscanner/data/10_A.in similarity index 100% rename from tests/zscanner/data/10_A.in rename to tests/libzscanner/data/10_A.in diff --git a/tests/zscanner/data/10_A.out b/tests/libzscanner/data/10_A.out similarity index 100% rename from tests/zscanner/data/10_A.out rename to tests/libzscanner/data/10_A.out diff --git a/tests/zscanner/data/11_AAAA.in b/tests/libzscanner/data/11_AAAA.in similarity index 100% rename from tests/zscanner/data/11_AAAA.in rename to tests/libzscanner/data/11_AAAA.in diff --git a/tests/zscanner/data/11_AAAA.out b/tests/libzscanner/data/11_AAAA.out similarity index 100% rename from tests/zscanner/data/11_AAAA.out rename to tests/libzscanner/data/11_AAAA.out diff --git a/tests/zscanner/data/12_TXT.in b/tests/libzscanner/data/12_TXT.in similarity index 100% rename from tests/zscanner/data/12_TXT.in rename to tests/libzscanner/data/12_TXT.in diff --git a/tests/zscanner/data/12_TXT.out b/tests/libzscanner/data/12_TXT.out similarity index 100% rename from tests/zscanner/data/12_TXT.out rename to tests/libzscanner/data/12_TXT.out diff --git a/tests/zscanner/data/13_SPF.in b/tests/libzscanner/data/13_SPF.in similarity index 100% rename from tests/zscanner/data/13_SPF.in rename to tests/libzscanner/data/13_SPF.in diff --git a/tests/zscanner/data/13_SPF.out b/tests/libzscanner/data/13_SPF.out similarity index 100% rename from tests/zscanner/data/13_SPF.out rename to tests/libzscanner/data/13_SPF.out diff --git a/tests/zscanner/data/14_NS.in b/tests/libzscanner/data/14_NS.in similarity index 100% rename from tests/zscanner/data/14_NS.in rename to tests/libzscanner/data/14_NS.in diff --git a/tests/zscanner/data/14_NS.out b/tests/libzscanner/data/14_NS.out similarity index 100% rename from tests/zscanner/data/14_NS.out rename to tests/libzscanner/data/14_NS.out diff --git a/tests/zscanner/data/15_CNAME.in b/tests/libzscanner/data/15_CNAME.in similarity index 100% rename from tests/zscanner/data/15_CNAME.in rename to tests/libzscanner/data/15_CNAME.in diff --git a/tests/zscanner/data/15_CNAME.out b/tests/libzscanner/data/15_CNAME.out similarity index 100% rename from tests/zscanner/data/15_CNAME.out rename to tests/libzscanner/data/15_CNAME.out diff --git a/tests/zscanner/data/16_PTR.in b/tests/libzscanner/data/16_PTR.in similarity index 100% rename from tests/zscanner/data/16_PTR.in rename to tests/libzscanner/data/16_PTR.in diff --git a/tests/zscanner/data/16_PTR.out b/tests/libzscanner/data/16_PTR.out similarity index 100% rename from tests/zscanner/data/16_PTR.out rename to tests/libzscanner/data/16_PTR.out diff --git a/tests/zscanner/data/17_DNAME.in b/tests/libzscanner/data/17_DNAME.in similarity index 100% rename from tests/zscanner/data/17_DNAME.in rename to tests/libzscanner/data/17_DNAME.in diff --git a/tests/zscanner/data/17_DNAME.out b/tests/libzscanner/data/17_DNAME.out similarity index 100% rename from tests/zscanner/data/17_DNAME.out rename to tests/libzscanner/data/17_DNAME.out diff --git a/tests/zscanner/data/18_MX.in b/tests/libzscanner/data/18_MX.in similarity index 100% rename from tests/zscanner/data/18_MX.in rename to tests/libzscanner/data/18_MX.in diff --git a/tests/zscanner/data/18_MX.out b/tests/libzscanner/data/18_MX.out similarity index 100% rename from tests/zscanner/data/18_MX.out rename to tests/libzscanner/data/18_MX.out diff --git a/tests/zscanner/data/19_AFSDB.in b/tests/libzscanner/data/19_AFSDB.in similarity index 100% rename from tests/zscanner/data/19_AFSDB.in rename to tests/libzscanner/data/19_AFSDB.in diff --git a/tests/zscanner/data/19_AFSDB.out b/tests/libzscanner/data/19_AFSDB.out similarity index 100% rename from tests/zscanner/data/19_AFSDB.out rename to tests/libzscanner/data/19_AFSDB.out diff --git a/tests/zscanner/data/20_RT.in b/tests/libzscanner/data/20_RT.in similarity index 100% rename from tests/zscanner/data/20_RT.in rename to tests/libzscanner/data/20_RT.in diff --git a/tests/zscanner/data/20_RT.out b/tests/libzscanner/data/20_RT.out similarity index 100% rename from tests/zscanner/data/20_RT.out rename to tests/libzscanner/data/20_RT.out diff --git a/tests/zscanner/data/21_KX.in b/tests/libzscanner/data/21_KX.in similarity index 100% rename from tests/zscanner/data/21_KX.in rename to tests/libzscanner/data/21_KX.in diff --git a/tests/zscanner/data/21_KX.out b/tests/libzscanner/data/21_KX.out similarity index 100% rename from tests/zscanner/data/21_KX.out rename to tests/libzscanner/data/21_KX.out diff --git a/tests/zscanner/data/22_HINFO.in b/tests/libzscanner/data/22_HINFO.in similarity index 100% rename from tests/zscanner/data/22_HINFO.in rename to tests/libzscanner/data/22_HINFO.in diff --git a/tests/zscanner/data/22_HINFO.out b/tests/libzscanner/data/22_HINFO.out similarity index 100% rename from tests/zscanner/data/22_HINFO.out rename to tests/libzscanner/data/22_HINFO.out diff --git a/tests/zscanner/data/23_MINFO.in b/tests/libzscanner/data/23_MINFO.in similarity index 100% rename from tests/zscanner/data/23_MINFO.in rename to tests/libzscanner/data/23_MINFO.in diff --git a/tests/zscanner/data/23_MINFO.out b/tests/libzscanner/data/23_MINFO.out similarity index 100% rename from tests/zscanner/data/23_MINFO.out rename to tests/libzscanner/data/23_MINFO.out diff --git a/tests/zscanner/data/24_RP.in b/tests/libzscanner/data/24_RP.in similarity index 100% rename from tests/zscanner/data/24_RP.in rename to tests/libzscanner/data/24_RP.in diff --git a/tests/zscanner/data/24_RP.out b/tests/libzscanner/data/24_RP.out similarity index 100% rename from tests/zscanner/data/24_RP.out rename to tests/libzscanner/data/24_RP.out diff --git a/tests/zscanner/data/25_SOA.in b/tests/libzscanner/data/25_SOA.in similarity index 100% rename from tests/zscanner/data/25_SOA.in rename to tests/libzscanner/data/25_SOA.in diff --git a/tests/zscanner/data/25_SOA.out b/tests/libzscanner/data/25_SOA.out similarity index 100% rename from tests/zscanner/data/25_SOA.out rename to tests/libzscanner/data/25_SOA.out diff --git a/tests/zscanner/data/26_SRV.in b/tests/libzscanner/data/26_SRV.in similarity index 100% rename from tests/zscanner/data/26_SRV.in rename to tests/libzscanner/data/26_SRV.in diff --git a/tests/zscanner/data/26_SRV.out b/tests/libzscanner/data/26_SRV.out similarity index 100% rename from tests/zscanner/data/26_SRV.out rename to tests/libzscanner/data/26_SRV.out diff --git a/tests/zscanner/data/27_NAPTR.in b/tests/libzscanner/data/27_NAPTR.in similarity index 100% rename from tests/zscanner/data/27_NAPTR.in rename to tests/libzscanner/data/27_NAPTR.in diff --git a/tests/zscanner/data/27_NAPTR.out b/tests/libzscanner/data/27_NAPTR.out similarity index 100% rename from tests/zscanner/data/27_NAPTR.out rename to tests/libzscanner/data/27_NAPTR.out diff --git a/tests/zscanner/data/28_TYPE.in b/tests/libzscanner/data/28_TYPE.in similarity index 100% rename from tests/zscanner/data/28_TYPE.in rename to tests/libzscanner/data/28_TYPE.in diff --git a/tests/zscanner/data/28_TYPE.out b/tests/libzscanner/data/28_TYPE.out similarity index 100% rename from tests/zscanner/data/28_TYPE.out rename to tests/libzscanner/data/28_TYPE.out diff --git a/tests/zscanner/data/29_CERT.in b/tests/libzscanner/data/29_CERT.in similarity index 100% rename from tests/zscanner/data/29_CERT.in rename to tests/libzscanner/data/29_CERT.in diff --git a/tests/zscanner/data/29_CERT.out b/tests/libzscanner/data/29_CERT.out similarity index 100% rename from tests/zscanner/data/29_CERT.out rename to tests/libzscanner/data/29_CERT.out diff --git a/tests/zscanner/data/30_KEY.in b/tests/libzscanner/data/30_KEY.in similarity index 100% rename from tests/zscanner/data/30_KEY.in rename to tests/libzscanner/data/30_KEY.in diff --git a/tests/zscanner/data/30_KEY.out b/tests/libzscanner/data/30_KEY.out similarity index 100% rename from tests/zscanner/data/30_KEY.out rename to tests/libzscanner/data/30_KEY.out diff --git a/tests/zscanner/data/31_DNSKEY.in b/tests/libzscanner/data/31_DNSKEY.in similarity index 100% rename from tests/zscanner/data/31_DNSKEY.in rename to tests/libzscanner/data/31_DNSKEY.in diff --git a/tests/zscanner/data/31_DNSKEY.out b/tests/libzscanner/data/31_DNSKEY.out similarity index 100% rename from tests/zscanner/data/31_DNSKEY.out rename to tests/libzscanner/data/31_DNSKEY.out diff --git a/tests/zscanner/data/32_APL.in b/tests/libzscanner/data/32_APL.in similarity index 100% rename from tests/zscanner/data/32_APL.in rename to tests/libzscanner/data/32_APL.in diff --git a/tests/zscanner/data/32_APL.out b/tests/libzscanner/data/32_APL.out similarity index 100% rename from tests/zscanner/data/32_APL.out rename to tests/libzscanner/data/32_APL.out diff --git a/tests/zscanner/data/33_DS.in b/tests/libzscanner/data/33_DS.in similarity index 100% rename from tests/zscanner/data/33_DS.in rename to tests/libzscanner/data/33_DS.in diff --git a/tests/zscanner/data/33_DS.out b/tests/libzscanner/data/33_DS.out similarity index 100% rename from tests/zscanner/data/33_DS.out rename to tests/libzscanner/data/33_DS.out diff --git a/tests/zscanner/data/34_SSHFP.in b/tests/libzscanner/data/34_SSHFP.in similarity index 100% rename from tests/zscanner/data/34_SSHFP.in rename to tests/libzscanner/data/34_SSHFP.in diff --git a/tests/zscanner/data/34_SSHFP.out b/tests/libzscanner/data/34_SSHFP.out similarity index 100% rename from tests/zscanner/data/34_SSHFP.out rename to tests/libzscanner/data/34_SSHFP.out diff --git a/tests/zscanner/data/35_IPSECKEY.in b/tests/libzscanner/data/35_IPSECKEY.in similarity index 100% rename from tests/zscanner/data/35_IPSECKEY.in rename to tests/libzscanner/data/35_IPSECKEY.in diff --git a/tests/zscanner/data/35_IPSECKEY.out b/tests/libzscanner/data/35_IPSECKEY.out similarity index 100% rename from tests/zscanner/data/35_IPSECKEY.out rename to tests/libzscanner/data/35_IPSECKEY.out diff --git a/tests/zscanner/data/36_RRSIG.in b/tests/libzscanner/data/36_RRSIG.in similarity index 100% rename from tests/zscanner/data/36_RRSIG.in rename to tests/libzscanner/data/36_RRSIG.in diff --git a/tests/zscanner/data/36_RRSIG.out b/tests/libzscanner/data/36_RRSIG.out similarity index 100% rename from tests/zscanner/data/36_RRSIG.out rename to tests/libzscanner/data/36_RRSIG.out diff --git a/tests/zscanner/data/37_NSEC.in b/tests/libzscanner/data/37_NSEC.in similarity index 100% rename from tests/zscanner/data/37_NSEC.in rename to tests/libzscanner/data/37_NSEC.in diff --git a/tests/zscanner/data/37_NSEC.out b/tests/libzscanner/data/37_NSEC.out similarity index 100% rename from tests/zscanner/data/37_NSEC.out rename to tests/libzscanner/data/37_NSEC.out diff --git a/tests/zscanner/data/38_DHCID.in b/tests/libzscanner/data/38_DHCID.in similarity index 100% rename from tests/zscanner/data/38_DHCID.in rename to tests/libzscanner/data/38_DHCID.in diff --git a/tests/zscanner/data/38_DHCID.out b/tests/libzscanner/data/38_DHCID.out similarity index 100% rename from tests/zscanner/data/38_DHCID.out rename to tests/libzscanner/data/38_DHCID.out diff --git a/tests/zscanner/data/39_NSEC3.in b/tests/libzscanner/data/39_NSEC3.in similarity index 100% rename from tests/zscanner/data/39_NSEC3.in rename to tests/libzscanner/data/39_NSEC3.in diff --git a/tests/zscanner/data/39_NSEC3.out b/tests/libzscanner/data/39_NSEC3.out similarity index 100% rename from tests/zscanner/data/39_NSEC3.out rename to tests/libzscanner/data/39_NSEC3.out diff --git a/tests/zscanner/data/40_NSEC3PARAM.in b/tests/libzscanner/data/40_NSEC3PARAM.in similarity index 100% rename from tests/zscanner/data/40_NSEC3PARAM.in rename to tests/libzscanner/data/40_NSEC3PARAM.in diff --git a/tests/zscanner/data/40_NSEC3PARAM.out b/tests/libzscanner/data/40_NSEC3PARAM.out similarity index 100% rename from tests/zscanner/data/40_NSEC3PARAM.out rename to tests/libzscanner/data/40_NSEC3PARAM.out diff --git a/tests/zscanner/data/41_TLSA.in b/tests/libzscanner/data/41_TLSA.in similarity index 100% rename from tests/zscanner/data/41_TLSA.in rename to tests/libzscanner/data/41_TLSA.in diff --git a/tests/zscanner/data/41_TLSA.out b/tests/libzscanner/data/41_TLSA.out similarity index 100% rename from tests/zscanner/data/41_TLSA.out rename to tests/libzscanner/data/41_TLSA.out diff --git a/tests/zscanner/data/42_LOC.in b/tests/libzscanner/data/42_LOC.in similarity index 100% rename from tests/zscanner/data/42_LOC.in rename to tests/libzscanner/data/42_LOC.in diff --git a/tests/zscanner/data/42_LOC.out b/tests/libzscanner/data/42_LOC.out similarity index 100% rename from tests/zscanner/data/42_LOC.out rename to tests/libzscanner/data/42_LOC.out diff --git a/tests/zscanner/data/43_EUI48.in b/tests/libzscanner/data/43_EUI48.in similarity index 100% rename from tests/zscanner/data/43_EUI48.in rename to tests/libzscanner/data/43_EUI48.in diff --git a/tests/zscanner/data/43_EUI48.out b/tests/libzscanner/data/43_EUI48.out similarity index 100% rename from tests/zscanner/data/43_EUI48.out rename to tests/libzscanner/data/43_EUI48.out diff --git a/tests/zscanner/data/44_EUI64.in b/tests/libzscanner/data/44_EUI64.in similarity index 100% rename from tests/zscanner/data/44_EUI64.in rename to tests/libzscanner/data/44_EUI64.in diff --git a/tests/zscanner/data/44_EUI64.out b/tests/libzscanner/data/44_EUI64.out similarity index 100% rename from tests/zscanner/data/44_EUI64.out rename to tests/libzscanner/data/44_EUI64.out diff --git a/tests/zscanner/data/45_NID.in b/tests/libzscanner/data/45_NID.in similarity index 100% rename from tests/zscanner/data/45_NID.in rename to tests/libzscanner/data/45_NID.in diff --git a/tests/zscanner/data/45_NID.out b/tests/libzscanner/data/45_NID.out similarity index 100% rename from tests/zscanner/data/45_NID.out rename to tests/libzscanner/data/45_NID.out diff --git a/tests/zscanner/data/46_L32.in b/tests/libzscanner/data/46_L32.in similarity index 100% rename from tests/zscanner/data/46_L32.in rename to tests/libzscanner/data/46_L32.in diff --git a/tests/zscanner/data/46_L32.out b/tests/libzscanner/data/46_L32.out similarity index 100% rename from tests/zscanner/data/46_L32.out rename to tests/libzscanner/data/46_L32.out diff --git a/tests/zscanner/data/47_L64.in b/tests/libzscanner/data/47_L64.in similarity index 100% rename from tests/zscanner/data/47_L64.in rename to tests/libzscanner/data/47_L64.in diff --git a/tests/zscanner/data/47_L64.out b/tests/libzscanner/data/47_L64.out similarity index 100% rename from tests/zscanner/data/47_L64.out rename to tests/libzscanner/data/47_L64.out diff --git a/tests/zscanner/data/48_LP.in b/tests/libzscanner/data/48_LP.in similarity index 100% rename from tests/zscanner/data/48_LP.in rename to tests/libzscanner/data/48_LP.in diff --git a/tests/zscanner/data/48_LP.out b/tests/libzscanner/data/48_LP.out similarity index 100% rename from tests/zscanner/data/48_LP.out rename to tests/libzscanner/data/48_LP.out diff --git a/tests/zscanner/data/49_CDS.in b/tests/libzscanner/data/49_CDS.in similarity index 100% rename from tests/zscanner/data/49_CDS.in rename to tests/libzscanner/data/49_CDS.in diff --git a/tests/zscanner/data/49_CDS.out b/tests/libzscanner/data/49_CDS.out similarity index 100% rename from tests/zscanner/data/49_CDS.out rename to tests/libzscanner/data/49_CDS.out diff --git a/tests/zscanner/data/50_CDNSKEY.in b/tests/libzscanner/data/50_CDNSKEY.in similarity index 100% rename from tests/zscanner/data/50_CDNSKEY.in rename to tests/libzscanner/data/50_CDNSKEY.in diff --git a/tests/zscanner/data/50_CDNSKEY.out b/tests/libzscanner/data/50_CDNSKEY.out similarity index 100% rename from tests/zscanner/data/50_CDNSKEY.out rename to tests/libzscanner/data/50_CDNSKEY.out diff --git a/tests/zscanner/data/51_URI.in b/tests/libzscanner/data/51_URI.in similarity index 100% rename from tests/zscanner/data/51_URI.in rename to tests/libzscanner/data/51_URI.in diff --git a/tests/zscanner/data/51_URI.out b/tests/libzscanner/data/51_URI.out similarity index 100% rename from tests/zscanner/data/51_URI.out rename to tests/libzscanner/data/51_URI.out diff --git a/tests/zscanner/data/52_CAA.in b/tests/libzscanner/data/52_CAA.in similarity index 100% rename from tests/zscanner/data/52_CAA.in rename to tests/libzscanner/data/52_CAA.in diff --git a/tests/zscanner/data/52_CAA.out b/tests/libzscanner/data/52_CAA.out similarity index 100% rename from tests/zscanner/data/52_CAA.out rename to tests/libzscanner/data/52_CAA.out diff --git a/tests/zscanner/data/includes/include1 b/tests/libzscanner/data/includes/include1 similarity index 100% rename from tests/zscanner/data/includes/include1 rename to tests/libzscanner/data/includes/include1 diff --git a/tests/zscanner/data/includes/include2 b/tests/libzscanner/data/includes/include2 similarity index 100% rename from tests/zscanner/data/includes/include2 rename to tests/libzscanner/data/includes/include2 diff --git a/tests/zscanner/data/includes/include3 b/tests/libzscanner/data/includes/include3 similarity index 100% rename from tests/zscanner/data/includes/include3 rename to tests/libzscanner/data/includes/include3 diff --git a/tests/zscanner/data/includes/include4 b/tests/libzscanner/data/includes/include4 similarity index 100% rename from tests/zscanner/data/includes/include4 rename to tests/libzscanner/data/includes/include4 diff --git a/tests/zscanner/data/includes/include5 b/tests/libzscanner/data/includes/include5 similarity index 100% rename from tests/zscanner/data/includes/include5 rename to tests/libzscanner/data/includes/include5 diff --git a/tests/zscanner/data/includes/include6 b/tests/libzscanner/data/includes/include6 similarity index 100% rename from tests/zscanner/data/includes/include6 rename to tests/libzscanner/data/includes/include6 diff --git a/tests/zscanner/processing.c b/tests/libzscanner/processing.c similarity index 97% rename from tests/zscanner/processing.c rename to tests/libzscanner/processing.c index ab22616550..a5ddeaa3d9 100644 --- a/tests/zscanner/processing.c +++ b/tests/libzscanner/processing.c @@ -19,9 +19,9 @@ #include #include -#include "zscanner/scanner.h" -#include "zscanner/functions.c" -#include "zscanner/processing.h" +#include "libzscanner/scanner.h" +#include "libzscanner/functions.c" +#include "libzscanner/processing.h" #include "libknot/descriptor.c" const char *separator = "------\n"; diff --git a/tests/zscanner/processing.h b/tests/libzscanner/processing.h similarity index 96% rename from tests/zscanner/processing.h rename to tests/libzscanner/processing.h index f3a7d196a5..fe66737bad 100644 --- a/tests/zscanner/processing.h +++ b/tests/libzscanner/processing.h @@ -16,7 +16,7 @@ #pragma once -#include "zscanner/scanner.h" +#include "libzscanner/scanner.h" void debug_process_error(zs_scanner_t *scanner); diff --git a/tests/zscanner/test_zscanner.in b/tests/libzscanner/test_zscanner.in similarity index 92% rename from tests/zscanner/test_zscanner.in rename to tests/libzscanner/test_zscanner.in index a1443e74e3..724e351d05 100644 --- a/tests/zscanner/test_zscanner.in +++ b/tests/libzscanner/test_zscanner.in @@ -1,7 +1,7 @@ #!/bin/sh -SOURCE=@top_srcdir@/tests/zscanner -BUILD=@top_builddir@/tests/zscanner +SOURCE=@top_srcdir@/tests/libzscanner +BUILD=@top_builddir@/tests/libzscanner . @top_srcdir@/tests/_libtap/tap/libtap.sh diff --git a/tests/zscanner/zscanner-tool.c b/tests/libzscanner/zscanner-tool.c similarity index 98% rename from tests/zscanner/zscanner-tool.c rename to tests/libzscanner/zscanner-tool.c index a8865616ab..06b795c11d 100644 --- a/tests/zscanner/zscanner-tool.c +++ b/tests/libzscanner/zscanner-tool.c @@ -20,8 +20,8 @@ #include #include -#include "zscanner/processing.h" -#include "zscanner/scanner.h" +#include "libzscanner/processing.h" +#include "libzscanner/scanner.h" #define DEFAULT_MODE 1 #define DEFAULT_CLASS 1