runtests: error out when tools are not built

diff --git a/regression-tests/runtests b/regression-tests/runtests
index d02ea7eb3b0232e272c4489e7d5c98930b6b603b..fb1577dcdf482d73b4f653879135c98eae804307 100755 (executable)
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -5,7 +5,6 @@ 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.
@@ -46,8 +45,9 @@ spectest=$1
 [ -z $spectest ] && spectest=""
 
 for prog in $SDIG $SAXFR $NOTIFY $NSEC3DIG; do
-  if `echo $prog | grep -q '\.\./pdns'`; then
-    ${MAKE} -C ../pdns ${prog##*../pdns/} || exit
+  if [ ! -x "$prog" ]; then
+    echo "Error: cannot find $prog, please build it."
+    exit 1
   fi
 done
 

diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index c33eb35c60011c51306ac2060e534c587e56a00b..c721f36f4197cf7b93bccfdf64a2125b87c58947 100755 (executable)
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -43,8 +43,6 @@ export FIX_TESTS=${FIX_TESTS:-NO}
 ALGORITHM=${ALGORITHM:="hmac-md5"}
 KEY=${KEY:="kp4/24gyYsEzbuTVJRUMoqGFmN3LYgVDzJ/3oRSP7ys="}
 
-MAKE=${MAKE:-make}
-
 export ALGORITHM
 export KEY