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 (file)
index 62226d0..0000000
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 (file)
index 0000000..b142acf
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 (file)
index 0000000..393f6a2
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 (file)
index 4489a6a..0000000
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 8fd6bcc008c084071ae0a00d59cb10c52e07a99c..f6497140ad9ecbfd14f2acab680fe766956642d8 100755 (executable)
--- 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 )
                # ----
                # -------------------------------------------------------------