From 2675554f6a5d0aa815d307faf75c5fca67079bf1 Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Thu, 10 Dec 2015 15:32:29 +0100
Subject: [PATCH] Don't configure before running tests

+ run tests in a separate directory
---
 .travis.yml                                               | 7 ++++---
 Makefile.in                                               | 3 ---
 configure.ac                                              | 2 +-
 src/Makefile.in                                           | 3 ---
 src/test/Makefile.in                                      | 5 -----
 src/test/tpkg/{run-tpkg-tests.sh.in => run-tpkg-tests.sh} | 2 +-
 src/test/tpkg/tpkg                                        | 5 ++++-
 7 files changed, 10 insertions(+), 17 deletions(-)
 rename src/test/tpkg/{run-tpkg-tests.sh.in => run-tpkg-tests.sh} (95%)

diff --git a/.travis.yml b/.travis.yml
index 99975050..2d86161a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,9 +4,10 @@ compiler:
   - clang
 before_script:
   - sudo apt-get update
-  - sudo apt-get install libunbound-dev libldns-dev libidn11-dev check libevent-dev libev-dev
+  - sudo apt-get install libunbound-dev libldns-dev libidn11-dev check libevent-dev libev-dev bc
 script:
   - libtoolize -fic
   - autoreconf -fi
-  - ./configure
-  - make tpkg
+  - mkdir tests
+  - cd tests
+  - sh src/test/tpkg/run-tpkg-tests.sh
diff --git a/Makefile.in b/Makefile.in
index e7de21f8..2401c646 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -94,9 +94,6 @@ doc:	FORCE
 example:
 	cd spec/example && $(MAKE) $@
 
-tpkg:
-	cd src && $(MAKE) $@
-
 test:
 	cd src && $(MAKE) $@
 
diff --git a/configure.ac b/configure.ac
index bdb9a02e..85c669a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -878,7 +878,7 @@ AC_SUBST(GETDNS_QUERY)
 AC_SUBST(INSTALL_GETDNS_QUERY)
 AC_SUBST(UNINSTALL_GETDNS_QUERY)
 
-AC_CONFIG_FILES([Makefile src/Makefile src/version.c src/getdns/getdns.h src/getdns/getdns_extra.h spec/example/Makefile src/test/Makefile src/test/tpkg/run-tpkg-tests.sh doc/Makefile getdns.pc])
+AC_CONFIG_FILES([Makefile src/Makefile src/version.c src/getdns/getdns.h src/getdns/getdns_extra.h spec/example/Makefile src/test/Makefile doc/Makefile getdns.pc])
 if [ test -n "$DOXYGEN" ]
     then AC_CONFIG_FILES([src/Doxyfile])
 fi
diff --git a/src/Makefile.in b/src/Makefile.in
index 79001513..d6d90054 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -148,9 +148,6 @@ libgetdns.la: $(GETDNS_OBJ) version.lo context.lo libmini_event.lo $(GLDNS_OBJ)
 	$(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) -o $@ $(GETDNS_OBJ) version.lo context.lo libmini_event.lo $(GLDNS_OBJ) $(COMPAT_OBJ) $(UTIL_OBJ) $(LDFLAGS) -rpath $(libdir) -version-info $(libversion) -no-undefined -export-symbols $(srcdir)/libgetdns.symbols
 
 
-tpkg:
-	cd test && $(MAKE) $@
-
 test:	all
 	cd test && $(MAKE) $@
 
diff --git a/src/test/Makefile.in b/src/test/Makefile.in
index 955f5615..f05cee3a 100644
--- a/src/test/Makefile.in
+++ b/src/test/Makefile.in
@@ -92,11 +92,6 @@ default: all
 
 all: $(PROGRAMS)
 
-tpkg: run-tpkg-tests
-
-run-tpkg-tests:
-	cd tpkg && sh run-tpkg-tests.sh
-
 $(ALL_OBJS):
 	$(LIBTOOL) --quiet --tag=CC --mode=compile $(CC) $(CFLAGS) $(LDNS_CFLAGS) -c $(srcdir)/$(@:.lo=.c) -o $@
 
diff --git a/src/test/tpkg/run-tpkg-tests.sh.in b/src/test/tpkg/run-tpkg-tests.sh
similarity index 95%
rename from src/test/tpkg/run-tpkg-tests.sh.in
rename to src/test/tpkg/run-tpkg-tests.sh
index 4d89bd56..cc077ac3 100644
--- a/src/test/tpkg/run-tpkg-tests.sh.in
+++ b/src/test/tpkg/run-tpkg-tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export SRCDIR=`(cd "@srcdir@"; pwd)`
+export SRCDIR=`dirname $0`
 export SRCROOT=`(cd "${SRCDIR}/../../.."; pwd)`
 export TPKG="${SRCDIR}/tpkg"
 export BUILDDIR=`pwd`
diff --git a/src/test/tpkg/tpkg b/src/test/tpkg/tpkg
index 5b6254cd..ab825b53 100755
--- a/src/test/tpkg/tpkg
+++ b/src/test/tpkg/tpkg
@@ -319,8 +319,11 @@ function report() {
                 if [[ $passed -lt $TPKG_PASS ]]; then
                         exit 1
                 fi
+	elif [[ $failed -gt 0 ]]; then
+		exit 1
+	else
+        	exit 0
         fi
-        exit 0
 }
 
 # clone test1 to test2