From 3a435d2e47b162b9eaaa1a922b1d97158b7c5f33 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Fri, 11 Nov 2016 20:29:16 +0100 Subject: [PATCH] build and test godbc backend in travis --- build-scripts/travis.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh index 3b0d84a606..41eb1bc7b6 100755 --- a/build-scripts/travis.sh +++ b/build-scripts/travis.sh @@ -224,6 +224,10 @@ install_auth() { run "sudo apt-get -qq --no-install-recommends install \ libzmq3-dev" + # godbc-backend + run "sudo apt-get -qq --no-install-recommends install \ + libsqliteodbc" + # authoritative test requirements / setup run "sudo apt-get -qq --no-install-recommends install \ bind9utils \ @@ -271,7 +275,9 @@ install_auth() { mysql-server" # godbc-backend test setup - run echo\ -e\ "[pdns-sqlite3-1]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite3\n\n[pdns-sqlite3-2]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite32\n"\ >\ ${HOME}/.odbc.ini + run 'echo -e "[pdns-sqlite3-1]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite3\n\n[pdns-sqlite3-2]\nDriver = SQLite3\nDatabase = ${PWD}/regression-tests/pdns.sqlite32\n" > ${HOME}/.odbc.ini' + run 'echo ${HOME}/.odbc.ini' + run 'cat ${HOME}/.odbc.ini' # ldap-backend test setup run "sudo apt-get -qq --no-install-recommends install \ @@ -355,7 +361,7 @@ build_auth() { run "./bootstrap" # Build without --enable-botan1.10 option, Botan/SoftHSM conflict #2496 run "CFLAGS='-O1' CXXFLAGS='-O1' ./configure \ - --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote tinydns' \ + --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 ldap lua mydns opendbx pipe random remote tinydns godbc' \ --with-modules='' \ --with-sqlite3 \ --enable-libsodium \ @@ -454,7 +460,7 @@ test_auth() { run "./timestamp ./start-test-stop 5300 gmysql-nsec3-narrow" run "export GODBC_SQLITE3_DSN=pdns-sqlite3-1" - # run "./timestamp ./start-test-stop 5300 godbc_sqlite3-nsec3" + run "./timestamp ./start-test-stop 5300 godbc_sqlite3-nsec3" run "./timestamp ./start-test-stop 5300 gpgsql-nodnssec-both" run "./timestamp ./start-test-stop 5300 gpgsql-both" -- 2.47.2