From: Fred Morcos <fred.morcos@open-xchange.com>
Date: Wed, 25 Sep 2024 15:09:15 +0000 (+0200)
Subject: Revert "runtests: error out when tools are not built"
X-Git-Tag: rec-5.2.0-alpha1~30^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8485330157b334c0814b4a79670024ae543a69b9;p=thirdparty%2Fpdns.git

Revert "runtests: error out when tools are not built"

This reverts commit fec46354337e3980c46a7cb28a59de5d0b933988.
---

diff --git a/regression-tests/runtests b/regression-tests/runtests
index fb1577dcdf..d02ea7eb3b 100755
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -5,6 +5,7 @@ if [ -z "$testsdir" ]; then
 fi
 
 PATH=.:$PATH:/usr/sbin
+MAKE=${MAKE:-make}
 
 if [ -z "$PDNS_BUILD_PATH" ]; then
   # PDNS_BUILD_PATH is unset or empty. Assume an autotools build.
@@ -45,9 +46,8 @@ spectest=$1
 [ -z $spectest ] && spectest=""
 
 for prog in $SDIG $SAXFR $NOTIFY $NSEC3DIG; do
-  if [ ! -x "$prog" ]; then
-    echo "Error: cannot find $prog, please build it."
-    exit 1
+  if `echo $prog | grep -q '\.\./pdns'`; then
+    ${MAKE} -C ../pdns ${prog##*../pdns/} || exit
   fi
 done
 
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index c721f36f41..c33eb35c60 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -43,6 +43,8 @@ export FIX_TESTS=${FIX_TESTS:-NO}
 ALGORITHM=${ALGORITHM:="hmac-md5"}
 KEY=${KEY:="kp4/24gyYsEzbuTVJRUMoqGFmN3LYgVDzJ/3oRSP7ys="}
 
+MAKE=${MAKE:-make}
+
 export ALGORITHM
 export KEY