]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Revert "runtests: error out when tools are not built"
authorFred Morcos <fred.morcos@open-xchange.com>
Wed, 25 Sep 2024 15:09:15 +0000 (17:09 +0200)
committerFred Morcos <fred.morcos@open-xchange.com>
Wed, 25 Sep 2024 15:09:15 +0000 (17:09 +0200)
This reverts commit fec46354337e3980c46a7cb28a59de5d0b933988.

regression-tests/runtests
regression-tests/start-test-stop

index fb1577dcdf482d73b4f653879135c98eae804307..d02ea7eb3b0232e272c4489e7d5c98930b6b603b 100755 (executable)
@@ -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
 
index c721f36f4197cf7b93bccfdf64a2125b87c58947..c33eb35c60011c51306ac2060e534c587e56a00b 100755 (executable)
@@ -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