From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 2 Dec 2013 12:48:44 +0000 (+0100)
Subject: allow overriding MAKE in regression tests
X-Git-Tag: rec-3.6.0-rc1~322
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04aaf5276f84c3e6742525ba7ddd4515ef34a98e;p=pdns

allow overriding MAKE in regression tests
---

diff --git a/regression-tests/runtests b/regression-tests/runtests
index 211cce2ca..6a660598f 100755
--- a/regression-tests/runtests
+++ b/regression-tests/runtests
@@ -1,10 +1,11 @@
 #!/bin/bash
 PATH=.:$PATH
+MAKE=${MAKE:-make}
 
 spectest=$1
 [ -z $spectest ] && spectest=""
 
-make -C ../pdns sdig nsec3dig || exit 1
+${MAKE} -C ../pdns sdig nsec3dig || exit 1
 
 rm -f test-results failed_tests passed_tests skipped_tests ${testsdir}/*/real_result ${testsdir}/*/diff ${testsdir}/*/*.out ${testsdir}/*/start ${testsdir}/*/step.*
 
diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop
index f54e937f5..a8bd46bbe 100755
--- a/regression-tests/start-test-stop
+++ b/regression-tests/start-test-stop
@@ -6,6 +6,8 @@ PDNS2=${PDNS2:-../pdns/pdns_server}
 ALGORITHM=${ALGORITHM:="hmac-md5"}
 KEY=${KEY:="kp4/24gyYsEzbuTVJRUMoqGFmN3LYgVDzJ/3oRSP7ys="}
 
+MAKE=${MAKE:-make}
+
 export ALGORITHM
 export KEY
 
@@ -189,7 +191,7 @@ __EOF__
 
 tosql ()
 {
-	make -C ../pdns zone2sql > /dev/null
+	${MAKE} -C ../pdns zone2sql > /dev/null
 	../pdns/zone2sql --transactions --$1 --named-conf=./named.conf
 }
 
@@ -326,7 +328,7 @@ __EOF__
 	exit 1
 fi
 
-make -C ../pdns sdig nsec3dig || exit 1
+${MAKE} -C ../pdns sdig nsec3dig || exit 1
 # Copy original zones because the test might modify them (well only the dyndns stuff, but let's make this work for others as well)
 for zone in $(grep zone named.conf  | cut -f2 -d\")
 do