Commit 853f1a8b authored by Daniel Salzman's avatar Daniel Salzman

dnssec: move dnssec tests to common tests

parent 6e1f51ce
......@@ -126,26 +126,6 @@ src/dnssec/shared/keyid_gnutls.h
src/dnssec/shared/pem.c
src/dnssec/shared/pem.h
src/dnssec/shared/shared.h
src/dnssec/tests/binary.c
src/dnssec/tests/crypto.c
src/dnssec/tests/key.c
src/dnssec/tests/key_algorithm.c
src/dnssec/tests/key_ds.c
src/dnssec/tests/keyid.c
src/dnssec/tests/keystore_pkcs11.c
src/dnssec/tests/keystore_pkcs8.c
src/dnssec/tests/keystore_pkcs8_dir.c
src/dnssec/tests/keytag.c
src/dnssec/tests/list.c
src/dnssec/tests/nsec_bitmap.c
src/dnssec/tests/nsec_hash.c
src/dnssec/tests/random.c
src/dnssec/tests/sample_keys.h
src/dnssec/tests/shared_bignum.c
src/dnssec/tests/shared_dname.c
src/dnssec/tests/sign.c
src/dnssec/tests/sign_der.c
src/dnssec/tests/tsig.c
src/knot/common/evsched.c
src/knot/common/evsched.h
src/knot/common/fdset.c
......@@ -475,6 +455,51 @@ tests/contrib/test_string.c
tests/contrib/test_strtonum.c
tests/contrib/test_time.c
tests/contrib/test_wire_ctx.c
tests/dnssec/sample_keys.h
tests/dnssec/test_binary.c
tests/dnssec/test_crypto.c
tests/dnssec/test_key.c
tests/dnssec/test_key_algorithm.c
tests/dnssec/test_key_ds.c
tests/dnssec/test_keyid.c
tests/dnssec/test_keystore_pkcs11.c
tests/dnssec/test_keystore_pkcs8.c
tests/dnssec/test_keystore_pkcs8_dir.c
tests/dnssec/test_keytag.c
tests/dnssec/test_list.c
tests/dnssec/test_nsec_bitmap.c
tests/dnssec/test_nsec_hash.c
tests/dnssec/test_random.c
tests/dnssec/test_shared_bignum.c
tests/dnssec/test_shared_dname.c
tests/dnssec/test_sign.c
tests/dnssec/test_sign_der.c
tests/dnssec/test_tsig.c
tests/knot/test_acl.c
tests/knot/test_changeset.c
tests/knot/test_conf.c
tests/knot/test_conf.h
tests/knot/test_conf_tools.c
tests/knot/test_confdb.c
tests/knot/test_confio.c
tests/knot/test_dthreads.c
tests/knot/test_fdset.c
tests/knot/test_journal.c
tests/knot/test_kasp_db.c
tests/knot/test_node.c
tests/knot/test_process_query.c
tests/knot/test_query_module.c
tests/knot/test_requestor.c
tests/knot/test_server.c
tests/knot/test_server.h
tests/knot/test_worker_pool.c
tests/knot/test_worker_queue.c
tests/knot/test_zone-tree.c
tests/knot/test_zone-update.c
tests/knot/test_zone_events.c
tests/knot/test_zone_serial.c
tests/knot/test_zone_timers.c
tests/knot/test_zonedb.c
tests/libknot/test_control.c
tests/libknot/test_cookies.c
tests/libknot/test_db.c
......@@ -496,30 +521,5 @@ tests/libknot/test_ypschema.c
tests/libknot/test_yptrafo.c
tests/modules/test_onlinesign.c
tests/modules/test_rrl.c
tests/test_acl.c
tests/test_changeset.c
tests/test_conf.c
tests/test_conf.h
tests/test_conf_tools.c
tests/test_confdb.c
tests/test_confio.c
tests/test_dthreads.c
tests/test_fdset.c
tests/test_journal.c
tests/test_kasp_db.c
tests/test_node.c
tests/test_process_query.c
tests/test_query_module.c
tests/test_requestor.c
tests/test_server.c
tests/test_server.h
tests/test_worker_pool.c
tests/test_worker_queue.c
tests/test_zone-tree.c
tests/test_zone-update.c
tests/test_zone_events.c
tests/test_zone_serial.c
tests/test_zone_timers.c
tests/test_zonedb.c
tests/utils/test_cert.c
tests/utils/test_lookup.c
......@@ -589,7 +589,6 @@ AC_CONFIG_FILES([Makefile
src/Makefile
src/contrib/dnstap/Makefile
src/dnssec/Makefile
src/dnssec/tests/Makefile
src/knot/modules/static_modules.h
src/zscanner/Makefile
])
......
SUBDIRS = . tests
.PHONY: check-compile
check-compile:
$(MAKE) $(AM_MAKEFLAGS) -C tests $@
AM_CPPFLAGS = \
-include $(top_builddir)/src/config.h \
-I$(srcdir)/shared \
......
/Makefile
/Makefile.in
/runtests.log
# test binaries
/binary
/crypto
/key
/key_algorithm
/key_ds
/keyid
/keystore_pkcs11
/keystore_pkcs8
/keystore_pkcs8_dir
/keytag
/list
/nsec_bitmap
/nsec_hash
/random
/shared_base32hex
/shared_bignum
/shared_dname
/shared_timestamp
/shared_wire
/sign
/sign_der
/tsig
AM_CPPFLAGS = \
-include $(top_builddir)/src/config.h \
-I$(top_srcdir)/libtap \
-I$(srcdir)/../shared \
-I$(srcdir)/../lib \
-I$(srcdir)/../lib/dnssec \
-I$(top_srcdir)/src \
$(gnutls_CFLAGS)
AM_LDFLAGS = \
-static
LDADD = \
$(top_builddir)/libtap/libtap.la \
$(builddir)/../libdnssec.la
CLEANFILES = runtests.log
EXTRA_DIST = sample_keys.h
check_PROGRAMS = \
binary \
crypto \
key \
key_algorithm \
key_ds \
keyid \
keystore_pkcs11 \
keystore_pkcs8 \
keystore_pkcs8_dir \
keytag \
list \
nsec_bitmap \
nsec_hash \
random \
sign \
sign_der \
shared_bignum \
shared_dname \
tsig
keystore_pkcs11_CPPFLAGS = $(AM_CPPFLAGS) -DLIBDIR='"$(libdir)"'
check-compile: $(check_PROGRAMS)
AM_V_RUNTESTS = $(am__v_RUNTESTS_@AM_V@)
am__v_RUNTESTS_ = $(am__v_RUNTESTS_@AM_DEFAULT_V@)
am__v_RUNTESTS_0 =
am__v_RUNTESTS_1 = RET=$$?; if [ "$$RET" != "0" ]; then cat "$(builddir)/runtests.log"; exit $$RET; fi
check-local: $(check_PROGRAMS)
@$(top_builddir)/libtap/runtests -s $(srcdir) \
-b $(builddir) \
-L $(builddir)/runtests.log \
$(check_PROGRAMS); \
$(AM_V_RUNTESTS)
......@@ -16,6 +16,26 @@
/contrib/test_time
/contrib/test_wire_ctx
/dnssec/test_binary
/dnssec/test_crypto
/dnssec/test_key
/dnssec/test_key_algorithm
/dnssec/test_key_ds
/dnssec/test_keyid
/dnssec/test_keystore_pkcs11
/dnssec/test_keystore_pkcs8
/dnssec/test_keystore_pkcs8_dir
/dnssec/test_keytag
/dnssec/test_list
/dnssec/test_nsec_bitmap
/dnssec/test_nsec_hash
/dnssec/test_random
/dnssec/test_sign
/dnssec/test_sign_der
/dnssec/test_shared_bignum
/dnssec/test_shared_dname
/dnssec/test_tsig
/knot/test_acl
/knot/test_changeset
/knot/test_conf
......
......@@ -2,14 +2,19 @@ AM_CPPFLAGS = \
-include $(top_builddir)/src/config.h \
-I$(top_srcdir)/libtap \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/dnssec/lib
-I$(top_srcdir)/src/dnssec/lib \
-I$(top_srcdir)/src/dnssec/shared \
-I$(top_srcdir)/src/dnssec/lib/dnssec \
$(gnutls_CFLAGS)
LDADD = \
$(top_builddir)/libtap/libtap.la \
$(top_builddir)/src/dnssec/libdnssec.la \
$(top_builddir)/src/libknot.la \
$(top_builddir)/src/libknotd.la \
$(top_builddir)/src/libcontrib.la \
$(libcrypto_LIBS)
$(top_builddir)/src/libcontrib.la
EXTRA_DIST = dnssec/sample_keys.h
check_PROGRAMS = \
contrib/test_base32hex \
......@@ -26,6 +31,27 @@ check_PROGRAMS = \
contrib/test_time \
contrib/test_wire_ctx
check_PROGRAMS += \
dnssec/test_binary \
dnssec/test_crypto \
dnssec/test_key \
dnssec/test_key_algorithm \
dnssec/test_key_ds \
dnssec/test_keyid \
dnssec/test_keystore_pkcs11 \
dnssec/test_keystore_pkcs8 \
dnssec/test_keystore_pkcs8_dir \
dnssec/test_keytag \
dnssec/test_list \
dnssec/test_nsec_bitmap \
dnssec/test_nsec_hash \
dnssec/test_random \
dnssec/test_sign \
dnssec/test_sign_der \
dnssec/test_shared_bignum \
dnssec/test_shared_dname \
dnssec/test_tsig
check_PROGRAMS += \
knot/test_acl \
knot/test_changeset \
......@@ -96,6 +122,10 @@ check_PROGRAMS += \
endif
endif
dnssec_keystore_pkcs11_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DLIBDIR='"$(libdir)"'
utils_test_lookup_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libedit_CFLAGS)
......@@ -107,8 +137,7 @@ utils_test_lookup_LDADD = \
utils_test_cert_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(libedit_CFLAGS) \
$(gnutls_CFLAGS)
$(libedit_CFLAGS)
utils_test_cert_LDADD = \
$(top_builddir)/libtap/libtap.la \
......
/* Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -23,6 +23,7 @@
#include "error.h"
#include "key.h"
#include "keystore.h"
#include "keystore/pkcs8_dir.c"
typedef struct test_pem {
const char *id;
......
/* Copyright (C) 2014 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
/* Copyright (C) 2018 CZ.NIC, z.s.p.o. <knot-dns@labs.nic.cz>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
......@@ -21,7 +21,7 @@
#include "binary.h"
#include "error.h"
#include "sign/der.h"
#include "sign/der.c"
static int binary_eq(const dnssec_binary_t *a, const dnssec_binary_t *b)
{
......
......@@ -11,6 +11,6 @@ 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 = \
EXTRA_DIST += \
knot/test_semantic_check.in \
knot/semantic_check_data
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment