Make sure a backend envvar is always provided to tests.

diff --git a/regression-tests/backends/bind-master b/regression-tests/backends/bind-master
index b91b83fc56c4e883c12bbcb22bb52eb06f95d066..cd6ab907ad3745231b3146267b77b1880a5bf2c5 100644 (file)
--- a/regression-tests/backends/bind-master
+++ b/regression-tests/backends/bind-master
@@ -1,5 +1,6 @@
 case $context in
     bind)
+        backend=bind
         cat > pdns-bind.conf << __EOF__
 module-dir=$PDNS_BUILD_PATH/modules
 launch=bind
@@ -17,6 +18,7 @@ __EOF__
 
     bind-dnssec | bind-dnssec-nsec3 | bind-hybrid-nsec3 | bind-dnssec-nsec3-optout | bind-dnssec-nsec3-narrow)
         rm -f dnssec.sqlite3
+        backend=bind
         cat > pdns-bind.conf << __EOF__
 module-dir=$PDNS_BUILD_PATH/modules
 launch=bind

diff --git a/regression-tests/backends/geoip-master b/regression-tests/backends/geoip-master
index c3e3ef1757966052ec5579b4d041f491b82178d6..93f8acecaa717daa39b90634a00edfe0f3d27494 100644 (file)
--- a/regression-tests/backends/geoip-master
+++ b/regression-tests/backends/geoip-master
@@ -116,6 +116,7 @@ Rcode: 0 (No Error), RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0
 Reply to question for qname='continent.geo.example.com.', qtype=TXT
 EOF
                # generate pdns.conf for pdnsutil
+               backend=geoip
                cat > pdns-geoip.conf <<EOF
 module-dir=./modules
 launch=geoip

diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave
index 1d9ee2bdbd22ad82204e9425c216f2edfdc8493e..e86c807c6c30aab1455dbae9eb2870d47d3683ca 100644 (file)
--- a/regression-tests/backends/gmysql-slave
+++ b/regression-tests/backends/gmysql-slave
@@ -11,6 +11,7 @@
        mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \
                "$GMYSQL2DB" < ../modules/gmysqlbackend/schema.mysql.sql
 
+       backend=gmysql2
        cat > pdns-gmysql2.conf << __EOF__
 module-dir=./modules
 launch=gmysql

diff --git a/regression-tests/backends/godbc_mssql-slave b/regression-tests/backends/godbc_mssql-slave
index 1c58ac2337b7a84fa7173dda84af0d3b0a80951b..4f57e95084942fd2e491ff2b97c7e26003ad89e4 100644 (file)
--- a/regression-tests/backends/godbc_mssql-slave
+++ b/regression-tests/backends/godbc_mssql-slave
@@ -5,6 +5,7 @@
                echo "drop table $table" | $ISQL -b
        done
        $ISQL < ../modules/godbcbackend/schema.mssql.sql
+       backend=godbc2
        cat > pdns-godbc2.conf << __EOF__
 module-dir=./modules
 launch=godbc

diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave
index e1b06f057279fcc9e91a27b9883a1fa12807e8b1..96da67174eeeb541fa593758f55992ccbdd2e7f9 100644 (file)
--- a/regression-tests/backends/gpgsql-slave
+++ b/regression-tests/backends/gpgsql-slave
@@ -6,6 +6,7 @@
        createdb --user="$GPGSQL2USER" "$GPGSQL2DB" || echo ignoring createdb failure
        psql --user="$GPGSQL2USER" "$GPGSQL2DB" < ../modules/gpgsqlbackend/schema.pgsql.sql
 
+       backend=gpgsql2
        cat > pdns-gpgsql2.conf << __EOF__
 module-dir=./modules
 launch=gpgsql

diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave
index 6dcc71376e892ab83826d60c37ca6aad0ef752ef..5b094a54c1e0507fe601368678f9c355de240ac5 100644 (file)
--- a/regression-tests/backends/gsqlite3-slave
+++ b/regression-tests/backends/gsqlite3-slave
@@ -2,6 +2,7 @@
        rm -f pdns.sqlite32
        sqlite3 pdns.sqlite32 < ../modules/gsqlite3backend/schema.sqlite3.sql
 
+       backend=gsqlite32
        cat > pdns-gsqlite32.conf << __EOF__
 module-dir=./modules
 launch=gsqlite3

diff --git a/regression-tests/backends/ldap-master b/regression-tests/backends/ldap-master
index cbb0d62c9147e4f4d2af9f4f3b8bf8d958d2fa92..f96e5843c0775fbd37f0879a8fcea2a319d59fbd 100644 (file)
--- a/regression-tests/backends/ldap-master
+++ b/regression-tests/backends/ldap-master
@@ -16,6 +16,7 @@ __EOF__
 
                $ZONE2LDAP --dnsttl=yes --basedn=$LDAPBASEDN --layout=$layout --named-conf=named.conf | ldapmodify -D $LDAPUSER -w $LDAPPASSWD -H $LDAPHOST -c > /dev/null || true
 
+               backend=ldap
                cat > pdns-ldap.conf << __EOF__
 module-dir=$PDNS_BUILD_PATH/modules
 launch=ldap

diff --git a/regression-tests/backends/lmdb-master b/regression-tests/backends/lmdb-master
index cdeb418df05aa38de8413e7c530d3ace08ac4c96..a9836b96b345af31685ff719819d9a027fe432c2 100644 (file)
--- a/regression-tests/backends/lmdb-master
+++ b/regression-tests/backends/lmdb-master
@@ -1,5 +1,6 @@
 case $context in
     lmdb | lmdb-nodnssec | lmdb-nsec3 | lmdb-nsec3-optout | lmdb-nsec3-narrow)
+        backend=lmdb
         cat > pdns-lmdb.conf << __EOF__
 module-dir=$PDNS_BUILD_PATH/modules
 launch=lmdb

diff --git a/regression-tests/backends/lmdb-slave b/regression-tests/backends/lmdb-slave
index 62057691b07a7cbde3d87b014e38b0faec4e9a1b..cbbbcc0c84a054aaf014989cca13de1dfd8d174e 100644 (file)
--- a/regression-tests/backends/lmdb-slave
+++ b/regression-tests/backends/lmdb-slave
@@ -1,4 +1,5 @@
         context=${context}-presigned-lmdb
+        backend=lmdb2
         cat > pdns-lmdb2.conf << __EOF__
 module-dir=./modules
 launch=lmdb

diff --git a/regression-tests/backends/lua2-master b/regression-tests/backends/lua2-master
index f636250eb19c163a94ec420adec506177da0b2ef..b6d805bea748731104afa6281302667908521b28 100644 (file)
--- a/regression-tests/backends/lua2-master
+++ b/regression-tests/backends/lua2-master
@@ -22,6 +22,7 @@ case $context in
                fi
 
                # generate pdns.conf for pdnsutil
+               backend=lua2
                cat > pdns-lua2.conf <<EOF
 module-dir=$PDNS_BUILD_PATH/modules
 launch=lua2

diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 7abb1b4502da3aa4079c73b83c4df83d6aec445e..f93608128952aead287be8b7c212a5179639df0e 100644 (file)
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -89,6 +89,7 @@ case $context in
 
 
                # generate pdns.conf for pdnsutil
+               backend=remote
                cat > pdns-remote.conf <<EOF
 module-dir=$PDNS_BUILD_PATH/modules
 launch=remote