tests: use sdig from PATH if available

diff --git a/regression-tests.api/runtests b/regression-tests.api/runtests
index beee380d3166cd7542cd6a592843c39002e94d2b..47f25f0f12c6a0838980bb8836613f1c5b435622 100755 (executable)
--- a/regression-tests.api/runtests
+++ b/regression-tests.api/runtests
@@ -9,6 +9,8 @@ fi
 python -V
 pip install -r requirements.txt
 
+export SDIG=$(type -P sdig)
+
 set -e
 if [ "${PDNS_DEBUG}" = "YES" ]; then
   set -x

diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 7f17a81831a5c74ade737ab5748faa22f0839b6c..8332fa465639a5cd18fbc6e26b7a5457486ed09c 100755 (executable)
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -100,7 +100,14 @@ common_args = [
     "--api-key="+APIKEY
 ]
 
-run_check_call(["make", "-C", "../pdns", "sdig"])
+# Take sdig if it exists (recursor in travis), otherwise build it from Authoritative source.
+sdig = os.environ.get("SDIG", "")
+if sdig:
+    sdig = os.path.abspath(sdig)
+if not sdig or not os.path.exists(sdig):
+    run_check_call(["make", "-C", "../pdns", "sdig"])
+    sdig = "../pdns/sdig"
+
 
 if daemon == 'authoritative':
 
@@ -165,7 +172,7 @@ if not available:
     sys.exit(2)
 
 print "Query for example.com/A to create statistic data..."
-run_check_call(["../pdns/sdig", "127.0.0.1", str(DNSPORT), "example.com", "A"])
+run_check_call([sdig, "127.0.0.1", str(DNSPORT), "example.com", "A"])
 
 print "Running tests..."
 returncode = 0