Merge pull request #8826 from rgacogne/nsec-invalid-bitmap-len

[thirdparty/pdns.git] / build-scripts / travis.sh

diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index 9c5f9dc54a22e4c1994872b53adb8657f19f9874..7b0f5314cc1809f8c67d181081f0e96d30900574 100755 (executable)
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -224,11 +224,6 @@ install_auth() {
   run "sudo apt-get -qq --no-install-recommends install \
     liblmdb-dev"
 
-  # opendbx-backend
-  run "sudo apt-get -qq --no-install-recommends install \
-    libopendbx1-dev \
-    libopendbx1-sqlite3"
-
   # remote-backend build requirements
   run "sudo apt-get -qq --no-install-recommends install \
     libzmq3-dev"
@@ -343,6 +338,7 @@ install_recursor() {
     libfaketime \
     libsnmp-dev \
     lua-posix \
+    lua-socket \
     moreutils \
     snmpd"
   run "cd .."
@@ -392,7 +388,7 @@ build_auth() {
   run "autoreconf -vi"
   run "./configure \
     ${sanitizerflags} \
-    --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 lmdb lua mydns opendbx pipe random remote tinydns godbc lua2' \
+    --with-dynmodules='bind gmysql geoip gpgsql gsqlite3 lmdb pipe random remote tinydns godbc lua2' \
     --with-modules='' \
     --with-sqlite3 \
     --with-libsodium \
@@ -444,6 +440,7 @@ build_recursor() {
     --with-libsodium \
     --enable-unit-tests \
     --enable-nod \
+    --disable-dnstap \
     --disable-silent-rules"
   run "make -k -j3"
   run "make install"
@@ -514,6 +511,8 @@ test_auth() {
   # run "./timestamp ./start-test-stop 5300 gmysql-nsec3-optout-both"
   run "./timestamp ./start-test-stop 5300 gmysql-nsec3-narrow"
 
+  run "sudo perl -i -pe 's/\]/]\nThreading=1/g' /etc/odbcinst.ini"
+  run "cat /etc/odbcinst.ini"
   run "export GODBC_SQLITE3_DSN=pdns-sqlite3-1"
   run "./timestamp ./start-test-stop 5300 godbc_sqlite3-nsec3"
 
@@ -529,10 +528,6 @@ test_auth() {
   # run "./timestamp ./start-test-stop 5300 gsqlite3-nsec3-optout-both"
   run "./timestamp ./start-test-stop 5300 gsqlite3-nsec3-narrow"
 
-  run "./timestamp ./start-test-stop 5300 mydns"
-
-  run "./timestamp ./start-test-stop 5300 opendbx-sqlite3"
-
   run "./timestamp ./start-test-stop 5300 remotebackend-pipe"
   run "./timestamp ./start-test-stop 5300 remotebackend-pipe-dnssec"
   #run "./timestamp ./start-test-stop 5300 remotebackend-unix"
@@ -551,12 +546,7 @@ test_auth() {
 
   run "rm tests/ent-asterisk/fail.nsec"
 
-  run "cd ../modules/luabackend/test2"
-  run "../../../regression-tests/timestamp ./runtest"
-
-  run "cd ../../.."
-
-  run "cd regression-tests.rootzone"
+  run "cd ../regression-tests.rootzone"
   run "./timestamp ./start-test-stop 5300 bind-both"
   run "./timestamp ./start-test-stop 5300 bind-dnssec-both"
   run "./timestamp ./start-test-stop 5300 bind-dnssec-nsec3-both"
@@ -637,7 +627,9 @@ test_recursor() {
 
 test_dnsdist(){
   run "cd regression-tests.dnsdist"
-  run "DNSDISTBIN=$HOME/dnsdist/bin/dnsdist ./runtests -v --ignore-files='(?:^\.|^_,|^setup\.py$|^test_DOH\.py$|^test_OCSP\.py$)'"
+  export SKIP_DOH_TESTS=1
+  export SKIP_PROMETHEUS_TESTS=1
+  run "DNSDISTBIN=$HOME/dnsdist/bin/dnsdist ./runtests -v --ignore-files='(?:^\.|^_,|^setup\.py$|^test_TLSSessionResumption\.py$)'"
   run "rm -f ./DNSCryptResolver.cert ./DNSCryptResolver.key"
   run "cd .."
 }