From: Willem Toorop <willem@nlnetlabs.nl>
Date: Mon, 15 Jul 2019 12:14:46 +0000 (+0200)
Subject: Prefer tpkg from submodule
X-Git-Tag: release-1.7.1-rc1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a20278fcafafaa5f3e277a21595be7f153ad77a7;p=thirdparty%2Fldns.git

Prefer tpkg from submodule
---

diff --git a/test/test_all.sh b/test/test_all.sh
index 5e2645bc..59ad08c2 100755
--- a/test/test_all.sh
+++ b/test/test_all.sh
@@ -4,14 +4,21 @@ cd test
 . common.sh
 
 # find tpkg
-if test -x "`which tpkg 2>&1`"; then
-	TPKG=tpkg
-else
-	TPKG=$1
-	if [ -z "$TPKG" ]
-	then
-	TPKG=$HOME/repos/tpkg/tpkg
-	fi
+
+if [ -z "$TPKG" -o ! -x "$TPKG" ]
+then
+        if [ -x tpkg/tpkg ]  ; then TPKG=`pwd`/tpkg/tpkg
+        elif [ -x test/tpkg/tpkg ]      ; then TPKG=`pwd`/test/tpkg/tpkg
+        elif which tpkg > /dev/null     ; then TPKG=`which tpkg`
+        else
+		TPKG=$1
+		if [ -z "$TPKG" ]
+		then
+			TPKG=$HOME/repos/tpkg/tpkg
+                	echo Did not find tpkg program!
+                	exit -1
+		fi
+        fi
 fi
 
 test_tool_avail "dig"
diff --git a/test/test_ci.sh b/test/test_ci.sh
index 21081a3d..c32279ba 100755
--- a/test/test_ci.sh
+++ b/test/test_ci.sh
@@ -19,12 +19,9 @@ 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
-        elif [ -x ../tpkg/tpkg ]	; then TPKG=../tpkg/tpkg
+        if [ -x tpkg/tpkg ]	; then TPKG=`pwd`/tpkg/tpkg
         elif [ -x test/tpkg/tpkg ]	; then TPKG=`pwd`/test/tpkg/tpkg
+        elif which tpkg > /dev/null	; then TPKG=`which tpkg`
         else
                 echo Did not find tpkg program!
                 exit -1