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

diff --git a/.travis.yml b/.travis.yml
index 3cf466ae8676123f1016e08f21b5f70567d25e14..e3fb2b4b3dfe08d5592dd029d830031277d3d41f 100644 (file)
--- 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 1f9cc570da94748e421ce74dadf8dfecd398453e..b7b8cb1b266f661a2fba8313cec94e8c599752ba 100755 (executable)
--- 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