From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 18 Jun 2013 13:51:33 +0000 (+0200)
Subject: Enabled unbound regression testing for FreeBSD jails
X-Git-Tag: release-1.6.17rc1~95
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ed2720da1b539d6fd4f0e5af445b9801c4640ea;p=thirdparty%2Fldns.git

Enabled unbound regression testing for FreeBSD jails
---

diff --git a/test/32-unbound-1.4.20-regression.tpkg b/test/32-unbound-1.4.20-regression.tpkg
deleted file mode 100644
index 62226d0c..00000000
Binary files a/test/32-unbound-1.4.20-regression.tpkg and /dev/null differ
diff --git a/test/32-unbound-regression.tpkg b/test/32-unbound-regression.tpkg
new file mode 100644
index 00000000..b142acf1
Binary files /dev/null and b/test/32-unbound-regression.tpkg differ
diff --git a/test/33-test-unbound-latest.tpkg b/test/33-test-unbound-latest.tpkg
new file mode 100644
index 00000000..393f6a24
Binary files /dev/null and b/test/33-test-unbound-latest.tpkg differ
diff --git a/test/33-wget-compile-test-unbound-latest.tpkg b/test/33-wget-compile-test-unbound-latest.tpkg
deleted file mode 100644
index 4489a6a9..00000000
Binary files a/test/33-wget-compile-test-unbound-latest.tpkg and /dev/null differ
diff --git a/test/test_ci.sh b/test/test_ci.sh
index 8fd6bcc0..f6497140 100755
--- a/test/test_ci.sh
+++ b/test/test_ci.sh
@@ -17,6 +17,18 @@ else
         NO_REGRESSION=0
 fi
 
+if [ -z "$TPKG" -o ! -x "$TPKG" ]
+then
+        if which tpkg > /dev/null       ; then TPKG=`which tpkg`
+        elif [ -x $HOME/bin/tpkg ]      ; then TPKG=$HOME/bin/tpkg
+        elif [ -x $HOME/local/bin/tpkg ]; then TPKG=$HOME/local/bin/tpkg
+        elif [ -x /home/tpkg/bin/tpkg ] ; then TPKG=/home/tpkg/bin/tpkg
+        else
+                echo Did not find tpkg program!
+                exit -1
+        fi
+fi
+
 # RUN THE TESTS
 for tests in $BUILD_DIR/test/*.tpkg 
 do
@@ -33,13 +45,13 @@ do
 	then
 		continue
 	fi
-	tpkg -b $BUILD_DIR/test -a $BUILD_DIR exe $TESTFN
+	$TPKG -b $BUILD_DIR/test -a $BUILD_DIR exe $TESTFN
 done
 
 # -----------------------------------------------------------------------------
 # ----  Testing part
 #
-( cd test; tpkg -q -n `ls result.*|wc -l` report >/dev/null )
+( cd test; $TPKG -q -n `ls result.*|wc -l` report >/dev/null )
 
 # -----------------------------------------------------------------------------
 # ----  Reusable reporting part
@@ -82,7 +94,7 @@ do
 		# -------------------------------------------------------------
 		# ----  Repository specific reporting part
 		# ----
-			( cd test; tpkg report )
+			( cd test; $TPKG report )
 		# ----
 		# -------------------------------------------------------------