From 4159360ee53372885ecceebe66c60d95051b192a Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 9 May 2016 14:13:37 +0200
Subject: [PATCH] Pass run-all.sh params to tpkg's configure calls

---
 src/test/tpkg/100-compile.tpkg/100-compile.pre     |  2 +-
 .../125-valgrind-checks.dsc                        |  2 +-
 .../200-stub-only-compile.pre                      |  2 +-
 .../225-stub-only-valgrind-checks.dsc              |  2 +-
 .../300-event-loops-configure.test                 | 14 +++++++-------
 src/test/tpkg/tpkg                                 |  8 +++++++-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/test/tpkg/100-compile.tpkg/100-compile.pre b/src/test/tpkg/100-compile.tpkg/100-compile.pre
index 95fbced2..6b76edba 100644
--- a/src/test/tpkg/100-compile.tpkg/100-compile.pre
+++ b/src/test/tpkg/100-compile.tpkg/100-compile.pre
@@ -25,4 +25,4 @@ done
 rm -fr "${BUILDDIR}/build"
 mkdir  "${BUILDDIR}/build"
 cd "${BUILDDIR}/build"
-"${SRCROOT}/configure" --prefix "${BUILDDIR}/install"
+"${SRCROOT}/configure" $* --prefix "${BUILDDIR}/install"
diff --git a/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.dsc b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.dsc
index c2204dee..93163e33 100644
--- a/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.dsc
+++ b/src/test/tpkg/125-valgrind-checks.tpkg/125-valgrind-checks.dsc
@@ -5,7 +5,7 @@ CreationDate: ma mrt 21 15:59:59 CET 2016
 Maintainer: Willem Toorop
 Category: 
 Component:
-CmdDepends: 
+CmdDepends: valgrind
 Depends: 110-link.tpkg
 Help:
 Pre: 
diff --git a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre
index 0b41e374..46686828 100644
--- a/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre
+++ b/src/test/tpkg/200-stub-only-compile.tpkg/200-stub-only-compile.pre
@@ -25,4 +25,4 @@ done
 rm -fr "${BUILDDIR}/build-stub-only"
 mkdir  "${BUILDDIR}/build-stub-only"
 cd "${BUILDDIR}/build-stub-only"
-"${SRCROOT}/configure" --enable-stub-only
+"${SRCROOT}/configure" $* --enable-stub-only
diff --git a/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.dsc b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.dsc
index 2ff59bdf..d845ad44 100644
--- a/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.dsc
+++ b/src/test/tpkg/225-stub-only-valgrind-checks.tpkg/225-stub-only-valgrind-checks.dsc
@@ -5,7 +5,7 @@ CreationDate: ma mrt 21 16:24:56 CET 2016
 Maintainer: Willem Toorop
 Category: 
 Component:
-CmdDepends: 
+CmdDepends: valgrind
 Depends: 110-link.tpkg
 Help:
 Pre: 
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 9ed6f38f..83ade30b 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 --enable-all-debugging --with-getdns_query --with-libevent --with-libev --with-libuv \
-    || "${SRCROOT}/configure" --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent --with-libev \
-    || "${SRCROOT}/configure" --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent --with-libuv \
-    || "${SRCROOT}/configure" --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libev --with-libuv \
-    || "${SRCROOT}/configure" --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent \
-    || "${SRCROOT}/configure" --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libev \
-    || "${SRCROOT}/configure" --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libuv
+"${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent --with-libev --with-libuv \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent --with-libev \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent --with-libuv \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libev --with-libuv \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libevent \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libev \
+    || "${SRCROOT}/configure" $* --enable-all-drafts --enable-all-debugging --with-getdns_query --with-libuv
diff --git a/src/test/tpkg/tpkg b/src/test/tpkg/tpkg
index 1ad07606..3e6deee0 100755
--- a/src/test/tpkg/tpkg
+++ b/src/test/tpkg/tpkg
@@ -414,7 +414,13 @@ do case "$o" in
 	v) 	version; exit 0;;
         l)      TPKG_LOG=1;;
         p)      TPKG_PRI="$OPTARG";;
-	a) 	TPKG_ARGS="$OPTARG";;
+	a) 	if [ -z "$TPKG_ARGS" ]
+		then
+			TPKG_ARGS="$OPTARG"
+		else
+			TPKG_ARGS="$TPKG_ARGS $OPTARG"
+		fi
+		;;
         q)      TPKG_QUIET=1;;
         k)      TPKG_KEEP=1;;
         n)      TPKG_PASS=$OPTARG