From 516570e1f8a97e7566e5b0cc021a84246d5dfa65 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 22 Aug 2017 12:16:48 +0200
Subject: [PATCH] Include stubby (building) in tpkg testing

---
 .../300-event-loops-configure.test                 | 14 +++++++-------
 .../400-static-analysis.pre                        | 14 +++++++-------
 stubby                                             |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/test/tpkg/300-event-loops-configure.tpkg/300-event-loops-configure.test b/src/test/tpkg/300-event-loops-configure.tpkg/300-event-loops-configure.test
index 5da09cd9..1169e337 100644
--- a/src/test/tpkg/300-event-loops-configure.tpkg/300-event-loops-configure.test
+++ b/src/test/tpkg/300-event-loops-configure.tpkg/300-event-loops-configure.test
@@ -7,10 +7,10 @@
 rm -fr "${BUILDDIR}/build-event-loops"
 mkdir  "${BUILDDIR}/build-event-loops"
 cd "${BUILDDIR}/build-event-loops"
-"${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev --with-libuv \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libuv \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev --with-libuv \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libuv
+"${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libevent --with-libev --with-libuv \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libevent --with-libev \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libevent --with-libuv \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libev --with-libuv \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libevent \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libev \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libuv
diff --git a/src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.pre b/src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.pre
index bda600f8..a79bdeed 100644
--- a/src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.pre
+++ b/src/test/tpkg/400-static-analysis.tpkg/400-static-analysis.pre
@@ -25,11 +25,11 @@ done
 rm -fr "${BUILDDIR}/build-static-analysis"
 mkdir  "${BUILDDIR}/build-static-analysis"
 cd "${BUILDDIR}/build-static-analysis"
-"${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev --with-libuv \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libev \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent --with-libuv \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev --with-libuv \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libevent \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libev \
-    || "${SRCROOT}/configure" $* --enable-all-drafts --with-getdns_query --with-libuv
+"${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libevent --with-libev --with-libuv \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libevent --with-libev \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libevent --with-libuv \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libev --with-libuv \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libevent \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libev \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --with-stubby --with-libuv
    
diff --git a/stubby b/stubby
index 2fa29a7b..1e19dcb5 160000
--- a/stubby
+++ b/stubby
@@ -1 +1 @@
-Subproject commit 2fa29a7b040a993c045ea3e75ae25420e6807c71
+Subproject commit 1e19dcb50f662b16717040b65e3d5fec4a332bd7