From 135753feb1390c3515a6a24ef5a04e761c75a3dc Mon Sep 17 00:00:00 2001 From: bert hubert Date: Mon, 21 Mar 2016 21:45:11 +0100 Subject: [PATCH] make regression tests look in sane default place for pdns_recursor, make travis put pdns_recursor in that sane place --- .travis.yml | 4 ++-- regression-tests.recursor/config.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 -- 2.47.2