From de490408cddeab5327ae007ef1d9ce1712007d85 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 10 Dec 2015 16:26:40 +0100
Subject: [PATCH] Use the verisign IPv6 upstream

google's sometimes timeouts...
---
 ...s_context_set_upstream_recursive_servers.h |  2 +-
 src/test/tpkg/run-all.sh                      | 23 +---------------
 src/test/tpkg/setup-env.sh                    | 26 +++++++++++++++++++
 3 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100755 src/test/tpkg/setup-env.sh

diff --git a/src/test/check_getdns_context_set_upstream_recursive_servers.h b/src/test/check_getdns_context_set_upstream_recursive_servers.h
index f5ba3eac..47a145a7 100644
--- a/src/test/check_getdns_context_set_upstream_recursive_servers.h
+++ b/src/test/check_getdns_context_set_upstream_recursive_servers.h
@@ -345,7 +345,7 @@
       struct getdns_dict *dict = NULL;
       struct getdns_dict *response = NULL;
       struct getdns_bindata address_type = { 5, (void *)"IPv6" };
-      struct getdns_bindata address_data = { 16, (void *)"\x20\x01\x48\x60\x48\x60\x00\x00\x00\x00\x00\x00\x00\x00\x88\x44" };
+      struct getdns_bindata address_data = { 16, (void *)"\x26\x20\x00\x74\x00\x1b\x00\x00\x00\x00\x00\x00\x00\x01\x00\x01" };
       size_t index = 0;
 
       CONTEXT_CREATE(TRUE);
diff --git a/src/test/tpkg/run-all.sh b/src/test/tpkg/run-all.sh
index cc077ac3..863500e1 100755
--- a/src/test/tpkg/run-all.sh
+++ b/src/test/tpkg/run-all.sh
@@ -1,28 +1,7 @@
 #!/bin/sh
 
 export SRCDIR=`dirname $0`
-export SRCROOT=`(cd "${SRCDIR}/../../.."; pwd)`
-export TPKG="${SRCDIR}/tpkg"
-export BUILDDIR=`pwd`
-export BUILDROOT=`(cd "${BUILDDIR}/../../.."; pwd)`
-export LIBTOOL="${BUILDROOT}/libtool"
-
-if [ -f .tpkg.var.master ]
-then
-	cat .tpkg.var.master \
-	    | egrep -v '^export SRCDIR=|^export SRCROOT=|^export TPKG=' \
-	    | egrep -v 'export BUILDDIR|^export BUILDROOT=|^export LIBTOOL=' \
-	        >.tpkg.var.master.cleanup
-	mv .tpkg.var.master.cleanup .tpkg.var.master
-fi
-cat >>.tpkg.var.master << END_OF_TPKG_VAR_MASTER
-export SRCDIR="${SRCDIR}"
-export SRCROOT="${SRCROOT}"
-export BUILDDIR="${BUILDDIR}"
-export BUILDROOT="${BUILDROOT}"
-export TPKG="${TPKG}"
-export LIBTOOL="${LIBTOOL}"
-END_OF_TPKG_VAR_MASTER
+. `dirname $0`/setup-env.sh
 
 for TEST_PKG in ${SRCDIR}/*.tpkg
 do
diff --git a/src/test/tpkg/setup-env.sh b/src/test/tpkg/setup-env.sh
new file mode 100755
index 00000000..931aa5f3
--- /dev/null
+++ b/src/test/tpkg/setup-env.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+export SRCDIR=`dirname $0`
+export SRCROOT=`(cd "${SRCDIR}/../../.."; pwd)`
+export TPKG="${SRCDIR}/tpkg"
+export BUILDDIR=`pwd`
+export BUILDROOT=`(cd "${BUILDDIR}/../../.."; pwd)`
+export LIBTOOL="${BUILDROOT}/libtool"
+
+if [ -f .tpkg.var.master ]
+then
+	cat .tpkg.var.master \
+	    | egrep -v '^export SRCDIR=|^export SRCROOT=|^export TPKG=' \
+	    | egrep -v 'export BUILDDIR|^export BUILDROOT=|^export LIBTOOL=' \
+	        >.tpkg.var.master.cleanup
+	mv .tpkg.var.master.cleanup .tpkg.var.master
+fi
+cat >>.tpkg.var.master << END_OF_TPKG_VAR_MASTER
+export SRCDIR="${SRCDIR}"
+export SRCROOT="${SRCROOT}"
+export BUILDDIR="${BUILDDIR}"
+export BUILDROOT="${BUILDROOT}"
+export TPKG="${TPKG}"
+export LIBTOOL="${LIBTOOL}"
+END_OF_TPKG_VAR_MASTER
+