From: Kees Monshouwer Date: Mon, 29 Sep 2014 20:22:01 +0000 (+0200) Subject: dynamic modules regression tests X-Git-Tag: auth-3.4.0^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74caf870eb8fef3de9c7885be375d1434d3d68f3;p=thirdparty%2Fpdns.git dynamic modules regression tests --- diff --git a/.travis.yml b/.travis.yml index 79f2bf8297..dfd83156e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ before_script: - p11-kit -l # ensure it's ok script: - ./bootstrap - - ./configure --with-modules='bind geoip gmysql gpgsql gsqlite3 mydns tinydns remote random opendbx ldap lmdb' --enable-unit-tests --enable-tools --enable-remotebackend-zeromq --enable-experimental-pkcs11 + - ./configure --with-dynmodules='bind geoip gmysql gpgsql gsqlite3 mydns tinydns remote random opendbx ldap lmdb' --with-modules='' --enable-unit-tests --enable-tools --enable-remotebackend-zeromq --enable-experimental-pkcs11 - make -k dist - make -k -j 4 - make -k install DESTDIR=/tmp/pdns-install-dir diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc index ced7179d53..134f79cfbc 100644 --- a/modules/remotebackend/test-remotebackend-http.cc +++ b/modules/remotebackend/test-remotebackend-http.cc @@ -43,7 +43,7 @@ struct RemotebackendSetup { be = 0; try { // setup minimum arguments - ::arg().set("module-dir")=""; + ::arg().set("module-dir")="./.libs"; new RemoteLoader(); BackendMakers().launch("remote"); // then get us a instance of it diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc index 4aa867089b..dea9c50a10 100644 --- a/modules/remotebackend/test-remotebackend-json.cc +++ b/modules/remotebackend/test-remotebackend-json.cc @@ -43,7 +43,7 @@ struct RemotebackendSetup { be = 0; try { // setup minimum arguments - ::arg().set("module-dir")=""; + ::arg().set("module-dir")="./.libs"; new RemoteLoader(); BackendMakers().launch("remote"); // then get us a instance of it diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc index b238de8609..331c34e03a 100644 --- a/modules/remotebackend/test-remotebackend-pipe.cc +++ b/modules/remotebackend/test-remotebackend-pipe.cc @@ -43,7 +43,7 @@ struct RemotebackendSetup { be = 0; try { // setup minimum arguments - ::arg().set("module-dir")=""; + ::arg().set("module-dir")="./.libs"; new RemoteLoader(); BackendMakers().launch("remote"); // then get us a instance of it diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc index 2e69e2c45c..9ad294346f 100644 --- a/modules/remotebackend/test-remotebackend-post.cc +++ b/modules/remotebackend/test-remotebackend-post.cc @@ -43,7 +43,7 @@ struct RemotebackendSetup { be = 0; try { // setup minimum arguments - ::arg().set("module-dir")=""; + ::arg().set("module-dir")="./.libs"; new RemoteLoader(); BackendMakers().launch("remote"); // then get us a instance of it diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc index 6825b32f72..7ee948025f 100644 --- a/modules/remotebackend/test-remotebackend-unix.cc +++ b/modules/remotebackend/test-remotebackend-unix.cc @@ -43,7 +43,7 @@ struct RemotebackendSetup { be = 0; try { // setup minimum arguments - ::arg().set("module-dir")=""; + ::arg().set("module-dir")="./.libs"; new RemoteLoader(); BackendMakers().launch("remote"); // then get us a instance of it diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc index a0b1764882..266ea19160 100644 --- a/modules/remotebackend/test-remotebackend-zeromq.cc +++ b/modules/remotebackend/test-remotebackend-zeromq.cc @@ -45,7 +45,7 @@ struct RemotebackendSetup { be = 0; try { // setup minimum arguments - ::arg().set("module-dir")=""; + ::arg().set("module-dir")="./.libs"; new RemoteLoader(); BackendMakers().launch("remote"); // then get us a instance of it diff --git a/pdns/ueberbackend.cc b/pdns/ueberbackend.cc index df812ae0b3..2576ab5d60 100644 --- a/pdns/ueberbackend.cc +++ b/pdns/ueberbackend.cc @@ -70,15 +70,15 @@ int UeberBackend::s_s=-1; // ? //! Loads a module and reports it to all UeberBackend threads bool UeberBackend::loadmodule(const string &name) { + L< pdns-gmysql.conf << __EOF__ +module-dir=./modules launch=gmysql gmysql-dbname=$GMYSQLDB gmysql-user=$GMYSQLUSER diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave index e318e3cdda..651f5dc221 100644 --- a/regression-tests/backends/gmysql-slave +++ b/regression-tests/backends/gmysql-slave @@ -12,6 +12,7 @@ "$GMYSQL2DB" < ../modules/gmysqlbackend/schema.mysql.sql cat > pdns-gmysql2.conf << __EOF__ +module-dir=./modules launch=gmysql gmysql-dbname=$GMYSQL2DB gmysql-user=$GMYSQL2USER diff --git a/regression-tests/backends/goracle-master b/regression-tests/backends/goracle-master index bec53470c8..a672986874 100644 --- a/regression-tests/backends/goracle-master +++ b/regression-tests/backends/goracle-master @@ -10,6 +10,7 @@ case $context in tosql goracle | sqlplus -S $GORACLEUSER/$GORACLEPASSWD@xe >> goracle.log cat > pdns-goracle.conf << __EOF__ +module-dir=./modules launch=goracle goracle-home=$ORACLE_HOME goracle-sid=$ORACLE_SID diff --git a/regression-tests/backends/goracle-slave b/regression-tests/backends/goracle-slave index fbe4068381..cd0d2315c0 100644 --- a/regression-tests/backends/goracle-slave +++ b/regression-tests/backends/goracle-slave @@ -6,6 +6,7 @@ echo "START ../modules/goraclebackend/schema.goracle.sql;" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe >> goracle2.log cat > pdns-goracle2.conf << __EOF__ +module-dir=./modules launch=goracle goracle-home=$ORACLE_HOME goracle-sid=$ORACLE_SID diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master index 63d3b81bb2..edb188db25 100644 --- a/regression-tests/backends/gpgsql-master +++ b/regression-tests/backends/gpgsql-master @@ -12,6 +12,7 @@ case $context in tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c cat > pdns-gpgsql.conf << __EOF__ +module-dir=./modules launch=gpgsql gpgsql-dbname=$GPGSQLDB gpgsql-user=$GPGSQLUSER diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave index 795cb8ad7d..9a6a8bf2c0 100644 --- a/regression-tests/backends/gpgsql-slave +++ b/regression-tests/backends/gpgsql-slave @@ -6,7 +6,8 @@ createdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring mysqladmin drop failure psql --user="$GPGSQL2USER" "$GPGSQL2DB" < ../modules/gpgsqlbackend/schema.pgsql.sql - cat > pdns-gpgsql2.conf << __EOF__ + cat > pdns-gpgsql2.conf << __EOF__ +module-dir=./modules launch=gpgsql gpgsql-dbname=$GPGSQL2DB gpgsql-user=$GPGSQL2USER diff --git a/regression-tests/backends/gsqlite3-master b/regression-tests/backends/gsqlite3-master index 0f02cc8e4c..c7b3ec0cbb 100644 --- a/regression-tests/backends/gsqlite3-master +++ b/regression-tests/backends/gsqlite3-master @@ -8,6 +8,7 @@ case $context in echo ANALYZE\; | sqlite3 pdns.sqlite3 cat > pdns-gsqlite3.conf << __EOF__ +module-dir=./modules launch=gsqlite3 gsqlite3-database=pdns.sqlite3 __EOF__ diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave index d0e2c63ff8..23ce476454 100644 --- a/regression-tests/backends/gsqlite3-slave +++ b/regression-tests/backends/gsqlite3-slave @@ -3,6 +3,7 @@ sqlite3 pdns.sqlite32 < ../modules/gsqlite3backend/schema.sqlite3.sql cat > pdns-gsqlite32.conf << __EOF__ +module-dir=./modules launch=gsqlite3 gsqlite3-database=pdns.sqlite32 gsqlite3-pragma-synchronous=0 diff --git a/regression-tests/backends/lmdb-master b/regression-tests/backends/lmdb-master index 53a9e45e17..faff62b6f7 100644 --- a/regression-tests/backends/lmdb-master +++ b/regression-tests/backends/lmdb-master @@ -77,7 +77,7 @@ case $context in --no-shuffle --launch=lmdb \ --send-root-referral \ --cache-ttl=$cachettl --experimental-dname-processing --no-config \ - --lmdb-datapath=./ --lmdb-experimental-dnssec & + --lmdb-datapath=./ --lmdb-experimental-dnssec --module-dir=./modules & skipreasons="noent nodyndns nometa lmdb" diff --git a/regression-tests/backends/mydns-master b/regression-tests/backends/mydns-master index 711e1b3b0a..51d1b3f99b 100644 --- a/regression-tests/backends/mydns-master +++ b/regression-tests/backends/mydns-master @@ -15,21 +15,18 @@ case $context in "$MYDNSDB" cat > pdns-mydns.conf << __EOF__ +module-dir=./modules launch=mydns mydns-dbname=$MYDNSDB mydns-user=$MYDNSUSER mydns-host=$MYDNSHOST mydns-password=$MYDNSPASSWD __EOF__ - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=mydns \ - --master --send-root-referral \ - --cache-ttl=0 --experimental-dname-processing --no-config \ - --mydns-rr-active=no --mydns-soa-active=no --mydns-use-minimal-ttl=no \ - --mydns-dbname="$MYDNSDB" \ - --mydns-user="$MYDNSUSER" \ - --mydns-host="$MYDNSHOST" \ - --mydns-password="$MYDNSPASSWD" & + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ + --config-dir=. --config-name=mydns \ + --no-shuffle --master --send-root-referral \ + --cache-ttl=0 --experimental-dname-processing \ + --mydns-rr-active=no --mydns-soa-active=no --mydns-use-minimal-ttl=no & skipreasons="nodnssec noent nodyndns nometa noaxfr" ;; diff --git a/regression-tests/backends/opendbx-master b/regression-tests/backends/opendbx-master index 79046ab088..4582b61b0f 100644 --- a/regression-tests/backends/opendbx-master +++ b/regression-tests/backends/opendbx-master @@ -12,7 +12,7 @@ case $context in --send-root-referral \ --cache-ttl=$cachettl --experimental-dname-processing --no-config \ --opendbx-backend=sqlite3 --opendbx-host-read=./ --opendbx-host-write=./ \ - --opendbx-database=pdns-opendbx.sqlite3 & + --opendbx-database=pdns-opendbx.sqlite3 --module-dir=./modules & skipreasons="nodnssec noent nodyndns nometa" ;; diff --git a/regression-tests/backends/oracle-master b/regression-tests/backends/oracle-master index 5462fe3d76..121bdd4ade 100644 --- a/regression-tests/backends/oracle-master +++ b/regression-tests/backends/oracle-master @@ -9,6 +9,7 @@ case $context in ../pdns/zone2sql --oracle | grep " 'SOA', " | sqlplus -S $ORACLEUSER/$ORACLEPASSWD@xe >> oracle.log cat > pdns-oracle.conf << __EOF__ +module-dir=./modules launch=oracle oracle-home=$ORACLE_HOME oracle-sid=$ORACLE_SID diff --git a/regression-tests/backends/oracle-slave b/regression-tests/backends/oracle-slave index 164447e66d..6bf9674d1f 100644 --- a/regression-tests/backends/oracle-slave +++ b/regression-tests/backends/oracle-slave @@ -6,6 +6,7 @@ echo "START ../modules/oraclebackend/schema.oracle.sql;" | sqlplus -S $ORACLE2USER/$ORACLE2PASSWD@xe >> oracle2.log cat > pdns-oracle2.conf << __EOF__ +module-dir=./modules launch=oracle oracle-home=$ORACLE_HOME oracle-sid=$ORACLE_SID diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master index 628c93384a..0dd7360a0e 100644 --- a/regression-tests/backends/remote-master +++ b/regression-tests/backends/remote-master @@ -80,6 +80,7 @@ case $context in # generate pdns.conf for pdnssec cat > pdns-remote.conf <