]> granicus.if.org Git - pdns/commitdiff
Use `${TRAVIS_BUILD_DIR}` instead of assuming the repo is in `pdns`
authorRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 8 Feb 2017 14:33:57 +0000 (15:33 +0100)
committerRemi Gacogne <remi.gacogne@powerdns.com>
Wed, 8 Feb 2017 14:33:57 +0000 (15:33 +0100)
Thus avoiding issues when/if the repository is cloned with a different
name.

build-scripts/travis.sh

index c4694d01f93c88839371b836cdeb51c889d15203..01aa1f137cf49a5418177f3d48e4f18e88c05de7 100755 (executable)
@@ -242,7 +242,7 @@ install_auth() {
   run "cd .."
   run "wget https://www.verisignlabs.com/dnssec-tools/packages/jdnssec-tools-0.13.tar.gz"
   run "sudo tar xfz jdnssec-tools-0.13.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 \
@@ -264,7 +264,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() {
     jq"
   run "cd .."
   run "wget https://s3.amazonaws.com/alexa-static/top-1m.csv.zip"
-  run "unzip top-1m.csv.zip -d ./pdns/regression-tests"
+  run "unzip top-1m.csv.zip -d ${TRAVIS_BUILD_DIR}/regression-tests"
   PDNS_SERVER_VERSION="0.0.880gcb54743-1pdns"
   run "wget https://downloads.powerdns.com/autobuilt/auth/deb/$PDNS_SERVER_VERSION.trusty-amd64/pdns-server_$PDNS_SERVER_VERSION.trusty_amd64.deb"
   run "wget https://downloads.powerdns.com/autobuilt/auth/deb/$PDNS_SERVER_VERSION.trusty-amd64/pdns-tools_$PDNS_SERVER_VERSION.trusty_amd64.deb"
@@ -353,7 +353,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() {
@@ -587,7 +587,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