mirror of https://github.com/getdnsapi/getdns.git
Some more fixes specific to travis
This commit is contained in:
parent
6d29f7fb65
commit
57e6487d76
|
@ -11,6 +11,7 @@ addons:
|
||||||
- check
|
- check
|
||||||
- libevent-dev
|
- libevent-dev
|
||||||
- libev-dev
|
- libev-dev
|
||||||
|
- libuv-dev
|
||||||
- valgrind
|
- valgrind
|
||||||
- clang
|
- clang
|
||||||
- wget
|
- wget
|
||||||
|
|
|
@ -812,7 +812,8 @@ void _getdns_context_equip_with_anchor(
|
||||||
context->trust_anchors_len = ta_len;
|
context->trust_anchors_len = ta_len;
|
||||||
context->trust_anchors_source = GETDNS_TASRC_XML;
|
context->trust_anchors_source = GETDNS_TASRC_XML;
|
||||||
}
|
}
|
||||||
DEBUG_ANCHOR("ta: %p, ta_len: %d\n", context->trust_anchors, (int)context->trust_anchors_len);
|
DEBUG_ANCHOR("ta: %p, ta_len: %d\n",
|
||||||
|
(void *)context->trust_anchors, (int)context->trust_anchors_len);
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
DEBUG_ANCHOR("Verifying trust-anchors failed!\n");
|
DEBUG_ANCHOR("Verifying trust-anchors failed!\n");
|
||||||
|
@ -1092,7 +1093,8 @@ static void tas_read_cb(void *userarg)
|
||||||
assert(n <= (ssize_t)a->tcp.to_read);
|
assert(n <= (ssize_t)a->tcp.to_read);
|
||||||
|
|
||||||
DEBUG_ANCHOR("read: %d bytes at %p, for doc %p of size %d\n",
|
DEBUG_ANCHOR("read: %d bytes at %p, for doc %p of size %d\n",
|
||||||
(int)n, a->tcp.read_pos, a->tcp.read_buf, (int)a->tcp.read_buf_len);
|
(int)n, (void *)a->tcp.read_pos
|
||||||
|
, (void *)a->tcp.read_buf, (int)a->tcp.read_buf_len);
|
||||||
a->tcp.read_pos += n;
|
a->tcp.read_pos += n;
|
||||||
a->tcp.to_read -= n;
|
a->tcp.to_read -= n;
|
||||||
if (a->tcp.to_read == 0)
|
if (a->tcp.to_read == 0)
|
||||||
|
|
|
@ -335,7 +335,7 @@ struct getdns_context {
|
||||||
tas_connection aaaa;
|
tas_connection aaaa;
|
||||||
uint8_t tas_hdr_spc[512];
|
uint8_t tas_hdr_spc[512];
|
||||||
|
|
||||||
_getdns_property can_write_appdata : 2;
|
_getdns_property can_write_appdata;
|
||||||
|
|
||||||
const char *root_anchor_url;
|
const char *root_anchor_url;
|
||||||
const char *root_anchor_verify_CA;
|
const char *root_anchor_verify_CA;
|
||||||
|
|
|
@ -5,12 +5,43 @@
|
||||||
[ -f .tpkg.var.test ] && source .tpkg.var.test
|
[ -f .tpkg.var.test ] && source .tpkg.var.test
|
||||||
|
|
||||||
cd "${BUILDDIR}/build-event-loops"
|
cd "${BUILDDIR}/build-event-loops"
|
||||||
if make -j 4 test
|
make -j 4 test
|
||||||
|
if test -e "${BUILDDIR}/build-event-loops/src/test/fails"
|
||||||
then
|
then
|
||||||
if test -e "${BUILDDIR}/build-event-loops/src/test/fails"
|
if test -e "${BUILDDIR}/build-event-loops/src/test/check_getdns.failed"
|
||||||
then
|
then
|
||||||
exit 1
|
echo ""
|
||||||
|
echo "********************"
|
||||||
|
echo "*** check_getdns ***"
|
||||||
|
echo "********************"
|
||||||
|
cat "${BUILDDIR}/build-event-loops/src/test/check_getdns.log"
|
||||||
|
fi
|
||||||
|
if test -e "${BUILDDIR}/build-event-loops/src/test/check_getdns_event.failed"
|
||||||
|
then
|
||||||
|
echo ""
|
||||||
|
echo "**************************"
|
||||||
|
echo "*** check_getdns_event ***"
|
||||||
|
echo "**************************"
|
||||||
|
cat "${BUILDDIR}/build-event-loops/src/test/check_getdns_event.log"
|
||||||
|
fi
|
||||||
|
if test -e "${BUILDDIR}/build-event-loops/src/test/check_getdns_ev.failed"
|
||||||
|
then
|
||||||
|
echo ""
|
||||||
|
echo "***********************"
|
||||||
|
echo "*** check_getdns_ev ***"
|
||||||
|
echo "***********************"
|
||||||
|
cat "${BUILDDIR}/build-event-loops/src/test/check_getdns_ev.log"
|
||||||
|
fi
|
||||||
|
if test -e "${BUILDDIR}/build-event-loops/src/test/check_getdns_uv.failed"
|
||||||
|
then
|
||||||
|
echo ""
|
||||||
|
echo "***********************"
|
||||||
|
echo "*** check_getdns_uv ***"
|
||||||
|
echo "***********************"
|
||||||
|
cat "${BUILDDIR}/build-event-loops/src/test/check_getdns_uv.log"
|
||||||
fi
|
fi
|
||||||
else
|
|
||||||
exit 1
|
exit 1
|
||||||
|
else
|
||||||
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue