Compile the GeoIP backend in travis and run tests

Install a newer boost (also needed for geosql later)

diff --git a/.travis.yml b/.travis.yml
index d44b7b0330b61c34b7027d90c8212742f271aa2c..0749acaeed9f0fa0a2c0e129b043f6526316db5f 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ before_script:
  - sudo /sbin/ip addr add 1.2.3.4/32 dev lo
  - 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
@@ -21,12 +22,11 @@ before_script:
      faketime
      geoip-database
      ldnsutils
-     libboost-all-dev
+     boost1.55
      libbotan1.10-dev
      libcdb-dev
      libcdb-dev
      libcurl4-openssl-dev
-     libgeoip-dev
      libldap2-dev
      liblua5.1-posix1
      libnet-dns-perl
@@ -52,7 +52,7 @@ before_script:
      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 liblmdb0 liblmdb-dev lmdb-utils libyaml-cpp-dev libzmq3-dev pandoc
+ - sudo apt-get install --quiet --quiet liblmdb0 liblmdb-dev lmdb-utils 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
  - sudo touch /etc/authbind/byport/53
@@ -84,7 +84,7 @@ script:
 #DNSName     --with-dynmodules='bind gmysql gpgsql gsqlite3 mydns tinydns remote random opendbx ldap lmdb lua'
 #Build without --enable-botan1.10 option, Botan/SoftHSM conflict #2496
  - ./configure
-     --with-dynmodules='bind gmysql gpgsql gsqlite3 mydns tinydns pipe remote random opendbx ldap lua'
+     --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 mydns tinydns pipe remote random opendbx ldap lua'
      --with-modules=''
      --with-sqlite3
      --enable-unit-tests
@@ -145,7 +145,7 @@ script:
  - touch tests/verify-dnssec-zone/allow-missing
  - touch tests/verify-dnssec-zone/skip.nsec3 # some (travis) tools in this test are unable to handle nsec3 zones
  - touch tests/verify-dnssec-zone/skip.optout
-#  - export geoipregion=oc geoipregionip=1.2.3.4
+ - export geoipregion=oc geoipregionip=1.2.3.4
  - ./timestamp ./start-test-stop 5300 bind-both
  - ./timestamp ./start-test-stop 5300 bind-dnssec-both
  - ./timestamp ./start-test-stop 5300 bind-dnssec-pkcs11
@@ -153,8 +153,8 @@ script:
  - ./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-optout-both
  - ./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-narrow
  - ./timestamp ./start-test-stop 5300 bind-hybrid-nsec3
-#  - ./timestamp ./start-test-stop 5300 geoipbackend
-#  - ./timestamp ./start-test-stop 5300 geoipbackend-nsec3-narrow
+ - ./timestamp ./start-test-stop 5300 geoipbackend
+ - ./timestamp ./start-test-stop 5300 geoipbackend-nsec3-narrow
  - ./timestamp ./start-test-stop 5300 gmysql-nodnssec-both
  - ./timestamp ./start-test-stop 5300 gmysql-both
  - ./timestamp ./start-test-stop 5300 gmysql-nsec3-both