tests: move libdnssec tests to libknot

diff --git a/Knot.files b/Knot.files
index f8db87443292d4c97d4aaf0e81cba92c51174d05..355f5947f78a23592c2328d1692cff16d1bbcbea 100644 (file)
--- a/Knot.files
+++ b/Knot.files
@@ -718,28 +718,28 @@ tests/knot/test_zone_events.c
 tests/knot/test_zone_serial.c
 tests/knot/test_zone_timers.c
 tests/knot/test_zonedb.c
-tests/libdnssec/test_binary.c
-tests/libdnssec/test_crypto.c
-tests/libdnssec/test_key.c
-tests/libdnssec/test_key_algorithm.c
-tests/libdnssec/test_key_ds.c
-tests/libdnssec/test_keyid.c
-tests/libdnssec/test_keystore_pkcs11.c
-tests/libdnssec/test_keystore_pkcs8.c
-tests/libdnssec/test_keytag.c
-tests/libdnssec/test_nsec_bitmap.c
-tests/libdnssec/test_nsec_hash.c
-tests/libdnssec/test_random.c
-tests/libdnssec/test_shared_bignum.c
-tests/libdnssec/test_shared_dname.c
-tests/libdnssec/test_sign.c
-tests/libdnssec/test_sign_der.c
-tests/libdnssec/test_tsig.c
 tests/libknot/test_control.c
 tests/libknot/test_cookies.c
 tests/libknot/test_db.c
 tests/libknot/test_descriptor.c
 tests/libknot/test_dname.c
+tests/libknot/test_dnssec_binary.c
+tests/libknot/test_dnssec_crypto.c
+tests/libknot/test_dnssec_key.c
+tests/libknot/test_dnssec_key_algorithm.c
+tests/libknot/test_dnssec_key_ds.c
+tests/libknot/test_dnssec_keyid.c
+tests/libknot/test_dnssec_keystore_pkcs11.c
+tests/libknot/test_dnssec_keystore_pkcs8.c
+tests/libknot/test_dnssec_keytag.c
+tests/libknot/test_dnssec_nsec_bitmap.c
+tests/libknot/test_dnssec_nsec_hash.c
+tests/libknot/test_dnssec_random.c
+tests/libknot/test_dnssec_shared_bignum.c
+tests/libknot/test_dnssec_shared_dname.c
+tests/libknot/test_dnssec_sign.c
+tests/libknot/test_dnssec_sign_der.c
+tests/libknot/test_dnssec_tsig.c
 tests/libknot/test_dynarray.c
 tests/libknot/test_edns.c
 tests/libknot/test_edns_ecs.c

diff --git a/Knot.includes b/Knot.includes
index c446244618aaeb8f1b2fc7824ab8bdfc80bdf9ed..a7b21fe3d31a8de65ee71cf25f3d9f2a85c65abe 100644 (file)
--- a/Knot.includes
+++ b/Knot.includes
@@ -80,7 +80,6 @@ tests-fuzz/check
 tests-fuzz/knotd_wrap
 tests/knot
 tests/knot/semantic_check_data
-tests/libdnssec
 tests/libknot
 tests/libzscanner
 tests/libzscanner/data

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 258ef902a58434f75a92ac258afdec0967c1e783..8e1d10cf2ca2babfa94c6b1b00c02636bf264c01 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,8 +1,6 @@
 AM_CPPFLAGS = \
        -include $(top_builddir)/src/config.h   \
        -I$(top_srcdir)/src                     \
-       -I$(top_srcdir)/src/libdnssec           \
-       -I$(top_srcdir)/src/libdnssec/shared    \
        $(gnutls_CFLAGS)                        \
        $(libkqueue_CFLAGS)                     \
        $(lmdb_CFLAGS)
@@ -21,7 +19,6 @@ endif HAVE_DAEMON
 
 LDADD += \
        $(top_builddir)/src/libknot.la          \
-       $(top_builddir)/src/libdnssec.la        \
        $(top_builddir)/src/libcontrib.la       \
        $(top_builddir)/src/libzscanner.la      \
        $(gnutls_LIBS)                          \
@@ -66,25 +63,6 @@ check_PROGRAMS = \
        contrib/test_toeplitz                   \
        contrib/test_wire_ctx
 
-check_PROGRAMS += \
-       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_keytag                   \
-       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
-
 if HAVE_DAEMON
 check_PROGRAMS += \
        contrib/test_atomic                     \
@@ -138,6 +116,23 @@ knot_test_process_query_SOURCES = \
 endif HAVE_DAEMON
 
 check_PROGRAMS += \
+       libknot/test_dnssec_binary              \
+       libknot/test_dnssec_crypto              \
+       libknot/test_dnssec_key                 \
+       libknot/test_dnssec_key_algorithm       \
+       libknot/test_dnssec_key_ds              \
+       libknot/test_dnssec_keyid               \
+       libknot/test_dnssec_keystore_pkcs11     \
+       libknot/test_dnssec_keystore_pkcs8      \
+       libknot/test_dnssec_keytag              \
+       libknot/test_dnssec_nsec_bitmap         \
+       libknot/test_dnssec_nsec_hash           \
+       libknot/test_dnssec_random              \
+       libknot/test_dnssec_sign                \
+       libknot/test_dnssec_sign_der            \
+       libknot/test_dnssec_shared_bignum       \
+       libknot/test_dnssec_shared_dname        \
+       libknot/test_dnssec_tsig                \
        libknot/test_control                    \
        libknot/test_cookies                    \
        libknot/test_db                         \
@@ -193,7 +188,7 @@ endif
 endif
 endif HAVE_DAEMON
 
-libdnssec_test_keystore_pkcs11_CPPFLAGS = \
+libknot_test_dnssec_keystore_pkcs11_CPPFLAGS = \
        $(AM_CPPFLAGS)                          \
        -DLIBDIR='"$(libdir)"'
 

diff --git a/tests/libdnssec/test_binary.c b/tests/libknot/test_dnssec_binary.c
similarity index 100%
rename from tests/libdnssec/test_binary.c
rename to tests/libknot/test_dnssec_binary.c

diff --git a/tests/libdnssec/test_crypto.c b/tests/libknot/test_dnssec_crypto.c
similarity index 100%
rename from tests/libdnssec/test_crypto.c
rename to tests/libknot/test_dnssec_crypto.c

diff --git a/tests/libdnssec/test_key.c b/tests/libknot/test_dnssec_key.c
similarity index 100%
rename from tests/libdnssec/test_key.c
rename to tests/libknot/test_dnssec_key.c

diff --git a/tests/libdnssec/test_key_algorithm.c b/tests/libknot/test_dnssec_key_algorithm.c
similarity index 100%
rename from tests/libdnssec/test_key_algorithm.c
rename to tests/libknot/test_dnssec_key_algorithm.c

diff --git a/tests/libdnssec/test_key_ds.c b/tests/libknot/test_dnssec_key_ds.c
similarity index 100%
rename from tests/libdnssec/test_key_ds.c
rename to tests/libknot/test_dnssec_key_ds.c

diff --git a/tests/libdnssec/test_keyid.c b/tests/libknot/test_dnssec_keyid.c
similarity index 100%
rename from tests/libdnssec/test_keyid.c
rename to tests/libknot/test_dnssec_keyid.c

diff --git a/tests/libdnssec/test_keystore_pkcs11.c b/tests/libknot/test_dnssec_keystore_pkcs11.c
similarity index 100%
rename from tests/libdnssec/test_keystore_pkcs11.c
rename to tests/libknot/test_dnssec_keystore_pkcs11.c

diff --git a/tests/libdnssec/test_keystore_pkcs8.c b/tests/libknot/test_dnssec_keystore_pkcs8.c
similarity index 100%
rename from tests/libdnssec/test_keystore_pkcs8.c
rename to tests/libknot/test_dnssec_keystore_pkcs8.c

diff --git a/tests/libdnssec/test_keytag.c b/tests/libknot/test_dnssec_keytag.c
similarity index 100%
rename from tests/libdnssec/test_keytag.c
rename to tests/libknot/test_dnssec_keytag.c

diff --git a/tests/libdnssec/test_nsec_bitmap.c b/tests/libknot/test_dnssec_nsec_bitmap.c
similarity index 100%
rename from tests/libdnssec/test_nsec_bitmap.c
rename to tests/libknot/test_dnssec_nsec_bitmap.c

diff --git a/tests/libdnssec/test_nsec_hash.c b/tests/libknot/test_dnssec_nsec_hash.c
similarity index 100%
rename from tests/libdnssec/test_nsec_hash.c
rename to tests/libknot/test_dnssec_nsec_hash.c

diff --git a/tests/libdnssec/test_random.c b/tests/libknot/test_dnssec_random.c
similarity index 100%
rename from tests/libdnssec/test_random.c
rename to tests/libknot/test_dnssec_random.c

diff --git a/tests/libdnssec/test_shared_bignum.c b/tests/libknot/test_dnssec_shared_bignum.c
similarity index 100%
rename from tests/libdnssec/test_shared_bignum.c
rename to tests/libknot/test_dnssec_shared_bignum.c

diff --git a/tests/libdnssec/test_shared_dname.c b/tests/libknot/test_dnssec_shared_dname.c
similarity index 100%
rename from tests/libdnssec/test_shared_dname.c
rename to tests/libknot/test_dnssec_shared_dname.c

diff --git a/tests/libdnssec/test_sign.c b/tests/libknot/test_dnssec_sign.c
similarity index 100%
rename from tests/libdnssec/test_sign.c
rename to tests/libknot/test_dnssec_sign.c

diff --git a/tests/libdnssec/test_sign_der.c b/tests/libknot/test_dnssec_sign_der.c
similarity index 100%
rename from tests/libdnssec/test_sign_der.c
rename to tests/libknot/test_dnssec_sign_der.c

diff --git a/tests/libdnssec/test_tsig.c b/tests/libknot/test_dnssec_tsig.c
similarity index 100%
rename from tests/libdnssec/test_tsig.c
rename to tests/libknot/test_dnssec_tsig.c