From 2165802a20f3e69371bc5f38aaf76ffc0d615f36 Mon Sep 17 00:00:00 2001 From: Remi Gacogne Date: Wed, 8 Feb 2017 15:33:57 +0100 Subject: [PATCH] Use `${TRAVIS_BUILD_DIR}` instead of assuming the repo is in `pdns` Thus avoiding issues when/if the repository is cloned with a different name. (cherry picked from commit 1e0253cad96199647f92ef4fa8230f614637e80c) --- build-scripts/travis.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh index 00a92075a..f9276bc3b 100755 --- a/build-scripts/travis.sh +++ b/build-scripts/travis.sh @@ -238,7 +238,7 @@ install_auth() { run "cd .." run "wget http://www.verisignlabs.com/dnssec-tools/packages/jdnssec-tools-0.12.tar.gz" run "sudo tar xfz jdnssec-tools-0.12.tar.gz --strip-components=1 -C /" - run "cd pdns" + run "cd ${TRAVIS_BUILD_DIR}" # pkcs11 test requirements / setup run "sudo apt-get -qq --no-install-recommends install \ @@ -260,7 +260,7 @@ install_auth() { run "tar xzvf dnsperf-2.0.0.0-1-rhel-6-x86_64.tar.gz" run "fakeroot alien --to-deb dnsperf-2.0.0.0-1/dnsperf-2.0.0.0-1.el6.x86_64.rpm" run "sudo dpkg -i dnsperf_2.0.0.0-2_amd64.deb" - run "cd pdns" + run "cd ${TRAVIS_BUILD_DIR}" # geoip-backend test requirements / setup run "sudo apt-get -qq --no-install-recommends install \ @@ -344,7 +344,7 @@ install_recursor() { run 'for suffix in {1..40}; do sudo /sbin/ip addr add 10.0.3.$suffix/32 dev lo; done' run "sudo touch /etc/authbind/byport/53" run "sudo chmod 755 /etc/authbind/byport/53" - run "cd pdns" + run "cd ${TRAVIS_BUILD_DIR}" } install_dnsdist() { @@ -576,7 +576,7 @@ run "cd .." run "wget http://ppa.launchpad.net/kalon33/gamesgiroll/ubuntu/pool/main/libs/libsodium/libsodium-dev_1.0.3-1~ppa14.04+1_amd64.deb" run "wget http://ppa.launchpad.net/kalon33/gamesgiroll/ubuntu/pool/main/libs/libsodium/libsodium13_1.0.3-1~ppa14.04+1_amd64.deb" run "sudo dpkg -i libsodium-dev_1.0.3-1~ppa14.04+1_amd64.deb libsodium13_1.0.3-1~ppa14.04+1_amd64.deb" -run "cd pdns" +run "cd ${TRAVIS_BUILD_DIR}" install_$PDNS_BUILD_PRODUCT -- 2.40.0