From: bert hubert <bert.hubert@netherlabs.nl>
Date: Mon, 21 Mar 2016 20:45:11 +0000 (+0100)
Subject: make regression tests look in sane default place for pdns_recursor, make travis put... 
X-Git-Tag: dnsdist-1.0.0-beta1~75^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=135753feb1390c3515a6a24ef5a04e761c75a3dc;p=thirdparty%2Fpdns.git

make regression tests look in sane default place for pdns_recursor, make travis put pdns_recursor in that sane place
---

diff --git a/.travis.yml b/.travis.yml
index 3cf466ae86..e3fb2b4b3d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -268,9 +268,9 @@ script:
   - cd pdns-recursor-*
   - ./configure
   - make -k -j3
+  - cd ../
+  - ln -s pdns-recursor*/pdns_recursor .
   - cd ../..
-  - ln -s recursordist/pdns-recursor*/pdns_recursor .
-  - cd ..
 
   # regression-tests
   - cd regression-tests.recursor
diff --git a/regression-tests.recursor/config.sh b/regression-tests.recursor/config.sh
index 1f9cc570da..b7b8cb1b26 100755
--- a/regression-tests.recursor/config.sh
+++ b/regression-tests.recursor/config.sh
@@ -5,7 +5,7 @@ if [ "${PDNS_DEBUG}" = "YES" ]; then
 fi
 
 export PDNS=${PDNS:-../../../pdns/pdns_server}
-export PDNSRECURSOR=${PDNSRECURSOR:-../../../pdns/pdns_recursor}
+export PDNSRECURSOR=${PDNSRECURSOR:-../../../pdns/recursordist/pdns_recursor}
 
 . ./vars