From 57e6487d76f95e6e08ca45e792e16c8923e631b1 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 14 Sep 2017 16:02:37 +0200
Subject: [PATCH] Some more fixes specific to travis

---
 .travis.yml                                   |  1 +
 src/anchor.c                                  |  6 ++-
 src/context.h                                 |  2 +-
 .../330-event-loops-unit-tests.test           | 39 +++++++++++++++++--
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d46dd307..a2f8b3b8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ addons:
     - check
     - libevent-dev
     - libev-dev
+    - libuv-dev
     - valgrind
     - clang
     - wget
diff --git a/src/anchor.c b/src/anchor.c
index 8dc31d0a..498ab7ca 100644
--- a/src/anchor.c
+++ b/src/anchor.c
@@ -812,7 +812,8 @@ void _getdns_context_equip_with_anchor(
 			context->trust_anchors_len = ta_len;
 			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 {
 		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);
 
 		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.to_read -= n;
 		if (a->tcp.to_read == 0)
diff --git a/src/context.h b/src/context.h
index 9d25e382..9bab5199 100644
--- a/src/context.h
+++ b/src/context.h
@@ -335,7 +335,7 @@ struct getdns_context {
 	tas_connection        aaaa;
 	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_verify_CA;
diff --git a/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.test b/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.test
index d34f8e8a..10ab6ded 100644
--- a/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.test
+++ b/src/test/tpkg/330-event-loops-unit-tests.tpkg/330-event-loops-unit-tests.test
@@ -5,12 +5,43 @@
 [ -f .tpkg.var.test ] && source .tpkg.var.test
 
 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
-	if test -e "${BUILDDIR}/build-event-loops/src/test/fails"
+	if test -e "${BUILDDIR}/build-event-loops/src/test/check_getdns.failed"
 	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
-else
 	exit 1
+else
+	exit 0
 fi
+