Update travis to trusty

diff --git a/.travis.yml b/.travis.yml
index 2642919155404152d14392fd1b9411ed7c72cb50..cd59f8436246cb6a2b8647339d10f6ec53885894 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,17 +2,16 @@ language: cpp
 compiler:
   - gcc
   - clang
+sudo: required
+dist: trusty
 before_script:
  - export POSIXLY_CORRECT=1
  - git describe --always --dirty=+
- - sudo /sbin/ip addr add 10.0.3.0/24 dev lo
+ - for suffix in {1..40}; do sudo /sbin/ip addr add 10.0.3.$suffix/32 dev lo; done
  - sudo /sbin/ip addr add 1.2.3.4/32 dev lo
+ - sudo sysctl net.ipv6.conf.all.disable_ipv6=0
  - sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list
- - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- - sudo add-apt-repository -y ppa:boost-latest/ppa
  - sudo apt-get update -qq
- - sudo apt-get -qq install g++-4.8
- - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
  - sudo apt-get install --quiet --quiet --no-install-recommends
      alien
      authbind
@@ -22,50 +21,53 @@ before_script:
      dnsutils
      faketime
      geoip-database
+     mysql-server
      ldnsutils
-     boost1.55
+     libboost-all-dev
      libbotan1.10-dev
      libcdb-dev
-     libcdb-dev
      libcurl4-openssl-dev
+     libgeoip-dev
      libldap2-dev
-     liblua5.1-posix1
      libnet-dns-perl
      libopendbx1-dev
      libopendbx1-sqlite3
      libp11-kit-dev
      libtolua-dev
      libtool
+     libyaml-cpp-dev
+     libzmq3-dev
      links
+     lua-posix
      moreutils
      p11-kit
+     pandoc
      pkg-config
      python-virtualenv
      rpm
      ruby-json
      ruby-sqlite3
      ruby1.9.1
-     rubygems
      socat
      softhsm
      time
      unbound-host
      xmlto
- - sudo sh -c 'sed s/precise/trusty/g /etc/apt/sources.list > /etc/apt/sources.list.d/trusty.list'
- - sudo apt-get update --quiet --quiet
- - sudo apt-get install --quiet --quiet libyaml-cpp-dev libzmq3-dev pandoc libgeoip-dev
- - sudo pip install pandocfilters==1.2.3 mkdocs==0.14 linkchecker==9.3 click==5.1
- - sudo update-alternatives --set ruby /usr/bin/ruby1.9.1
+ - virtualenv $HOME/.venv
+ - source $HOME/.venv/bin/activate
+ - pip install pyopenssl ndg-httpsclient pyasn1
+ - pip install pandocfilters==1.2.3 mkdocs==0.14 linkchecker==9.3 click==5.1
+ - deactivate
  - sudo touch /etc/authbind/byport/53
  - sudo chmod 755 /etc/authbind/byport/53
  - cd ..
+ - wget https://xs.powerdns.com/tmp/libsodium_1.0.2-1_amd64.deb
+ - sudo dpkg -i libsodium_1.0.2-1_amd64.deb
+ - sudo mv /usr/local/lib/libsodium.* /usr/lib
  - wget ftp://ftp.nominum.com/pub/nominum/dnsperf/2.0.0.0/dnsperf-2.0.0.0-1-rhel-6-x86_64.tar.gz
  - tar xzvf dnsperf-2.0.0.0-1-rhel-6-x86_64.tar.gz
  - fakeroot alien --to-deb dnsperf-2.0.0.0-1/dnsperf-2.0.0.0-1.el6.x86_64.rpm
  - sudo dpkg -i dnsperf_2.0.0.0-2_amd64.deb
- - wget https://xs.powerdns.com/tmp/libsodium_1.0.2-1_amd64.deb
- - sudo dpkg -i libsodium_1.0.2-1_amd64.deb
- - sudo mv /usr/local/lib/libsodium.* /usr/lib
  - wget http://s3.amazonaws.com/alexa-static/top-1m.csv.zip
  - unzip top-1m.csv.zip -d ./pdns/regression-tests
  - cd pdns
@@ -83,7 +85,8 @@ before_script:
 script:
  - ./bootstrap
 #Build without --enable-botan1.10 option, Botan/SoftHSM conflict #2496
- - CFLAGS='-O1' CXXFLAGS='-O1' ./configure
+ - source $HOME/.venv/bin/activate
+ - ./configure
      --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 mydns tinydns pipe remote random opendbx ldap lua'
      --with-modules=''
      --with-sqlite3
@@ -94,26 +97,27 @@ script:
      --enable-tools
      --disable-dependency-tracking
  - make -k dist
- - make -k -j 2
+ - make -k -j 4 V=1
  - cd docs
  - make check-links
+ - deactivate
  - cd ..
  - make -k install DESTDIR=/tmp/pdns-install-dir
  - find /tmp/pdns-install-dir -ls
- - make -j 2 check
+ - make -j 4 check V=1
  - test -f pdns/test-suite.log && cat pdns/test-suite.log || true
  - test -f modules/remotebackend/test-suite.log && cat modules/remotebackend/test-suite.log || true
 # DNSName: - make -k -j 2 -C pdns $(grep '(EXEEXT):' pdns/Makefile | cut -f1 -d\$ | grep -E -v 'dnsdist|calidns')
  - make -k -j 2 -C pdns $(grep '(EXEEXT):' pdns/Makefile | cut -f1 -d\$ | grep -E -v 'dnsdist|calidns|speedtest')
  - cd pdns
- - make -k -j 2 pdns_recursor
+ - make -k -j 4 pdns_recursor
  - rm -f pdns_recursor
  - ./pdnssec test-algorithms
  - cd ..
  - ./build-scripts/dist-recursor
  - cd pdns/pdns-recursor-*/
- - OPTFLAGS=-O0 ./configure
- - OPTFLAGS=-O0 make -k -j 2
+ - ./configure
+ - make -k -j 4
  - cd ..
  - ln -s pdns-recursor*/pdns_recursor .
  - cd ..
@@ -121,8 +125,8 @@ script:
  - cd pdns/dnsdistdist
  - tar xf dnsdist*.tar.bz2
  - cd dnsdist-*
- - CFLAGS='-O0' CXXFLAGS='-O0' ./configure
- - make -k -j 2
+ - ./configure
+ - make -k -j 4
  - cd ..
  - rm -rf dnsdist-*/
  - cd ../../
@@ -160,24 +164,24 @@ script:
  - ./timestamp ./start-test-stop 5300 gmysql-nsec3-optout-both
  - ./timestamp ./start-test-stop 5300 gmysql-nsec3-narrow
  - ./timestamp ./start-test-stop 5300 gpgsql-nodnssec-both
-# - ./timestamp ./start-test-stop 5300 gpgsql-both
+ - ./timestamp ./start-test-stop 5300 gpgsql-both
  - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-both
-# - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-optout-both
-# - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-narrow
+ - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-optout-both
+ - ./timestamp ./start-test-stop 5300 gpgsql-nsec3-narrow
  - ./timestamp ./start-test-stop 5300 gsqlite3-nodnssec-both
-# - ./timestamp ./start-test-stop 5300 gsqlite3-both
+ - ./timestamp ./start-test-stop 5300 gsqlite3-both
  - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-both
-# - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-optout-both
-# - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-narrow
+ - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-optout-both
+ - ./timestamp ./start-test-stop 5300 gsqlite3-nsec3-narrow
  - ./timestamp ./start-test-stop 5300 mydns
  - ./timestamp ./start-test-stop 5300 opendbx-sqlite3
  - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-pipe
  - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-pipe-dnssec
-# - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-unix
+ - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-unix
  - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-unix-dnssec
-# - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-http
+ - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-http
  - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-http-dnssec
-# - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-zeromq
+ - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-zeromq
  - travis_retry ./timestamp timeout 120s ./start-test-stop 5300 remotebackend-zeromq-dnssec
  - ./timestamp ./start-test-stop 5300 tinydns
  - rm -f tests/verify-dnssec-zone/allow-missing

diff --git a/regression-tests/softhsm.mod b/regression-tests/softhsm.mod
index 1f1ff1939350359bc852d5e70697f69bb4756d78..c986ac7f9b34a9617eb52a1c0f5e885e64064add 100644 (file)
--- a/regression-tests/softhsm.mod
+++ b/regression-tests/softhsm.mod
@@ -1,2 +1,2 @@
-module: /usr/lib/libsofthsm.so
+module: /usr/lib/softhsm/libsofthsm.so
 managed: yes