summaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/Makefile.in93
-rw-r--r--src/tests/common/acl_tests.c2
-rw-r--r--src/tests/common/descriptor_tests.c37
-rw-r--r--src/tests/common/events_tests.c8
-rw-r--r--src/tests/common/fdset_tests.c5
-rw-r--r--src/tests/knot/dthreads_tests.c4
6 files changed, 100 insertions, 49 deletions
diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in
index fefb224..1f0e87d 100644
--- a/src/tests/Makefile.in
+++ b/src/tests/Makefile.in
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# Makefile.in generated by automake 1.12.6 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1994-2012 Free Software Foundation, Inc.
+
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -53,15 +52,16 @@ host_triplet = @host@
check_PROGRAMS = unittests$(EXEEXT)
TESTS = unittests$(EXEEXT)
subdir = src/tests
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+ $(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
$(top_srcdir)/m4/ax_ext.m4 \
$(top_srcdir)/m4/ax_gcc_x86_cpuid.m4 \
- $(top_srcdir)/m4/ax_recvmmsg.m4 $(top_srcdir)/m4/libtool.m4 \
- $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
- $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
- $(top_srcdir)/m4/visibility.m4 $(top_srcdir)/configure.ac
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/visibility.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
@@ -88,6 +88,19 @@ unittests_DEPENDENCIES = ../libknotd.la ../libknots.la @LIBOBJS@
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
+am__v_lt_1 =
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -100,20 +113,16 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(AM_CFLAGS) $(CFLAGS)
AM_V_CC = $(am__v_CC_@AM_V@)
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo " CC " $@;
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
+am__v_CC_0 = @echo " CC " $@;
+am__v_CC_1 =
CCLD = $(CC)
LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
AM_V_CCLD = $(am__v_CCLD_@AM_V@)
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo " CCLD " $@;
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo " GEN " $@;
+am__v_CCLD_0 = @echo " CCLD " $@;
+am__v_CCLD_1 =
SOURCES = $(unittests_SOURCES) $(nodist_unittests_SOURCES)
DIST_SOURCES = $(unittests_SOURCES)
am__can_run_installinfo = \
@@ -123,8 +132,10 @@ am__can_run_installinfo = \
esac
ETAGS = etags
CTAGS = ctags
-am__tty_colors = \
-red=; grn=; lgn=; blu=; std=
+am__tty_colors_dummy = \
+ mgn= red= grn= lgn= blu= brg= std=; \
+ am__color_tests=no
+am__tty_colors = $(am__tty_colors_dummy)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -433,26 +444,10 @@ unittests$(EXEEXT): $(unittests_OBJECTS) $(unittests_DEPENDENCIES) $(EXTRA_unitt
mostlyclean-compile:
-rm -f *.$(OBJEXT)
- -rm -f common/acl_tests.$(OBJEXT)
- -rm -f common/base32hex_tests.$(OBJEXT)
- -rm -f common/base64_tests.$(OBJEXT)
- -rm -f common/descriptor_tests.$(OBJEXT)
- -rm -f common/events_tests.$(OBJEXT)
- -rm -f common/fdset_tests.$(OBJEXT)
- -rm -f common/hattrie_tests.$(OBJEXT)
- -rm -f common/skiplist_tests.$(OBJEXT)
- -rm -f common/slab_tests.$(OBJEXT)
- -rm -f knot/conf_tests.$(OBJEXT)
- -rm -f knot/dthreads_tests.$(OBJEXT)
- -rm -f knot/journal_tests.$(OBJEXT)
- -rm -f knot/rrl_tests.$(OBJEXT)
- -rm -f knot/server_tests.$(OBJEXT)
- -rm -f libknot/dname_tests.$(OBJEXT)
- -rm -f libknot/rrset_tests.$(OBJEXT)
- -rm -f libknot/sign_tests.$(OBJEXT)
- -rm -f libknot/wire_tests.$(OBJEXT)
- -rm -f libknot/ztree_tests.$(OBJEXT)
- -rm -f zscanner/zscanner_tests.$(OBJEXT)
+ -rm -f common/*.$(OBJEXT)
+ -rm -f knot/*.$(OBJEXT)
+ -rm -f libknot/*.$(OBJEXT)
+ -rm -f zscanner/*.$(OBJEXT)
distclean-compile:
-rm -f *.tab.c
@@ -558,6 +553,20 @@ GTAGS:
&& $(am__cd) $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: $(HEADERS) $(SOURCES) $(LISP)
+ list='$(SOURCES) $(HEADERS) $(LISP)'; \
+ case "$(srcdir)" in \
+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+ *) sdir=$(subdir)/$(srcdir) ;; \
+ esac; \
+ for i in $$list; do \
+ if test -f "$$i"; then \
+ echo "$(subdir)/$$i"; \
+ else \
+ echo "$$sdir/$$i"; \
+ fi; \
+ done >> $(top_builddir)/cscope.files
+
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -571,7 +580,7 @@ check-TESTS: $(TESTS)
if test -f ./$$tst; then dir=./; \
elif test -f $$tst; then dir=; \
else dir="$(srcdir)/"; fi; \
- if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+ if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \
all=`expr $$all + 1`; \
case " $(XFAIL_TESTS) " in \
*[\ \ ]$$tst[\ \ ]*) \
@@ -806,8 +815,8 @@ uninstall-am:
.MAKE: all check check-am install install-am install-strip
.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
- clean-checkPROGRAMS clean-generic clean-libtool ctags \
- distclean distclean-compile distclean-generic \
+ clean-checkPROGRAMS clean-generic clean-libtool cscopelist \
+ ctags distclean distclean-compile distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
install-data-am install-dvi install-dvi-am install-exec \
diff --git a/src/tests/common/acl_tests.c b/src/tests/common/acl_tests.c
index f8ab106..e115dc4 100644
--- a/src/tests/common/acl_tests.c
+++ b/src/tests/common/acl_tests.c
@@ -145,7 +145,7 @@ static int acl_tests_run(int argc, char *argv[])
acl_create(acl, &match_pf4, ACL_ACCEPT, 0, 0); /* Make decoy. */
acl_key_t *rval = NULL;
ret = acl_match(acl, &test_pf4, &rval);
- ok(rval->val == sval, "acl: search for preferred node");
+ ok(rval && rval->val == sval, "acl: search for preferred node");
// 19. Scenario after truncating
ok(acl_truncate(acl) == ACL_ACCEPT, "acl: truncate");
diff --git a/src/tests/common/descriptor_tests.c b/src/tests/common/descriptor_tests.c
index 9d752f5..4f1fb6c 100644
--- a/src/tests/common/descriptor_tests.c
+++ b/src/tests/common/descriptor_tests.c
@@ -36,7 +36,7 @@ unit_api descriptor_tests_api = {
static int descriptor_tests_count(int argc, char *argv[])
{
- return 68;
+ return 81;
}
static int descriptor_tests_run(int argc, char *argv[])
@@ -230,5 +230,40 @@ static int descriptor_tests_run(int argc, char *argv[])
ret = knot_rrclass_from_string("CLASS65536", &num);
cmp_ok(ret, "==", -1, "get CLASS65536 num ret");
+ // Get obsolete descriptor:
+ // 30. TYPE0
+ descr = get_obsolete_rdata_descriptor(0);
+ ok(descr->type_name == 0, "get TYPE0 descriptor name");
+ cmp_ok(descr->block_types[0], "==", KNOT_RDATA_WF_REMAINDER,
+ "get TYPE0 descriptor 1. item type");
+ cmp_ok(descr->block_types[1], "==", KNOT_RDATA_WF_END,
+ "get TYPE0 descriptor 2. item type");
+
+ // 31. MD
+ descr = get_obsolete_rdata_descriptor(3);
+ ok(strcmp(descr->type_name, "MD") == 0, "get MD descriptor name");
+ cmp_ok(descr->block_types[0], "==", KNOT_RDATA_WF_COMPRESSED_DNAME,
+ "get A descriptor 1. item type");
+ cmp_ok(descr->block_types[1], "==", KNOT_RDATA_WF_END,
+ "get A descriptor 2. item type");
+
+ // 32. NXT
+ descr = get_obsolete_rdata_descriptor(30);
+ ok(strcmp(descr->type_name, "NXT") == 0, "get NXT descriptor name");
+ cmp_ok(descr->block_types[0], "==", KNOT_RDATA_WF_COMPRESSED_DNAME,
+ "get CNAME descriptor 1. item type");
+ cmp_ok(descr->block_types[1], "==", KNOT_RDATA_WF_REMAINDER,
+ "get CNAME descriptor 2. item type");
+ cmp_ok(descr->block_types[2], "==", KNOT_RDATA_WF_END,
+ "get CNAME descriptor 3. item type");
+
+ // 33. TYPE38 (A6)
+ descr = get_obsolete_rdata_descriptor(38);
+ ok(descr->type_name == 0, "get TYPE38 descriptor name");
+ cmp_ok(descr->block_types[0], "==", KNOT_RDATA_WF_REMAINDER,
+ "get TYPE38 descriptor 1. item type");
+ cmp_ok(descr->block_types[1], "==", KNOT_RDATA_WF_END,
+ "get TYPE38 descriptor 2. item type");
+
return 0;
}
diff --git a/src/tests/common/events_tests.c b/src/tests/common/events_tests.c
index 713bb5a..6ceb17a 100644
--- a/src/tests/common/events_tests.c
+++ b/src/tests/common/events_tests.c
@@ -51,7 +51,11 @@ void* term_thr(void *arg)
static int events_tests_count(int argc, char *argv[])
{
- return 9 + 11;
+ int count = 9 + 10;
+#ifdef ENABLE_TIMED_TESTS
+ count += 1;
+#endif
+ return count;
}
static int events_tests_run(int argc, char *argv[])
@@ -137,6 +141,7 @@ static int events_tests_run(int argc, char *argv[])
gettimeofday(&rt, 0);
ok(e != 0, "evsched: received valid event");
+#ifdef ENABLE_TIMED_TESTS
// 4. Check receive time
double passed = (rt.tv_sec - st.tv_sec) * 1000;
passed += (rt.tv_usec - st.tv_usec) / 1000;
@@ -145,6 +150,7 @@ static int events_tests_run(int argc, char *argv[])
int in_bounds = (passed >= lb) && (passed <= ub);
ok(in_bounds, "evsched: receive time %.1lfms is in <%.1lf,%.1lf>",
passed, lb, ub);
+#endif
// 5. Check data
ok(e->data == (void*)0xcafe, "evsched: received data is valid");
diff --git a/src/tests/common/fdset_tests.c b/src/tests/common/fdset_tests.c
index e8b9d73..f5d351c 100644
--- a/src/tests/common/fdset_tests.c
+++ b/src/tests/common/fdset_tests.c
@@ -121,12 +121,11 @@ static int fdset_tests_run(int argc, char *argv[])
pthread_create(&t, 0, thr_action, &fds[1]);
/* 4. Watch fdset. */
- int nfds = poll(set.pfd, set.n, 2000);
+ int nfds = poll(set.pfd, set.n, 60 * 1000);
gettimeofday(&te, 0);
size_t diff = timeval_diff(&ts, &te);
- ok(nfds > 0 && diff > 99 && diff < 10000,
- "fdset: poll returned %d events in %zu ms", nfds, diff);
+ ok(nfds > 0, "fdset: poll returned %d events in %zu ms", nfds, diff);
/* 5. Prepare event set. */
ok(set.pfd[0].revents & POLLIN, "fdset: pipe is active");
diff --git a/src/tests/knot/dthreads_tests.c b/src/tests/knot/dthreads_tests.c
index 247f66e..e562648 100644
--- a/src/tests/knot/dthreads_tests.c
+++ b/src/tests/knot/dthreads_tests.c
@@ -107,7 +107,9 @@ static inline int dt_test_repurpose(dt_unit_t *unit, int id)
/*! \brief Cancel single thread. */
static inline int dt_test_cancel(dt_unit_t *unit, int id)
{
- return dt_cancel(unit->threads[id]) == 0;
+ int ret = dt_cancel(unit->threads[id]);
+ ret |= dt_signalize(unit->threads[id], SIGALRM);
+ return ret == 0; /* Both succeeded. */
}
/*! \brief Reanimate dead threads. */
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-20 23:48:03 +0000