From 544e5f848fc921b21e2068bb8394f72dff4055a9 Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Mon, 14 Apr 2014 13:35:03 +0200 Subject: [PATCH] run nodnssec slave tests without the (backend)-dnssec option --- regression-tests/backends/gmysql-slave | 6 +++++- regression-tests/backends/goracle-slave | 6 +++++- regression-tests/backends/gpgsql-slave | 6 +++++- regression-tests/backends/gsqlite3-slave | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave index 76ba3b71c4..568a87b48c 100644 --- a/regression-tests/backends/gmysql-slave +++ b/regression-tests/backends/gmysql-slave @@ -17,9 +17,13 @@ gmysql-dbname=$GMYSQL2DB gmysql-user=$GMYSQL2USER gmysql-host=$GMYSQL2HOST gmysql-password=$GMYSQL2PASSWD -gmysql-dnssec __EOF__ + if [[ $context != *nodnssec* ]] + then + echo "gmysql-dnssec" >> pdns-gmysql2.conf + fi + for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | tac) do mysql --user="$GMYSQL2USER" --password="$GMYSQL2PASSWD" --host="$GMYSQL2HOST" \ diff --git a/regression-tests/backends/goracle-slave b/regression-tests/backends/goracle-slave index 27b5cacd08..4403ed4432 100644 --- a/regression-tests/backends/goracle-slave +++ b/regression-tests/backends/goracle-slave @@ -14,9 +14,13 @@ goracle-nls-lang=$NLS_LANG goracle-tnsname=xe goracle-user=$GORACLE2USER goracle-password=$GORACLE2PASSWD -goracle-dnssec __EOF__ + if [[ $context != *nodnssec* ]] + then + echo "goracle-dnssec" >> pdns-goracle2.conf + fi + for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | tac) do echo "INSERT INTO domains (id, name, type, master) VALUES(domains_id_sequence.nextval, '$zone', 'SLAVE', '127.0.0.1:$port');" | sqlplus -S $GORACLE2USER/$GORACLE2PASSWD@xe >> goracle2.log diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave index 1aa3027cab..0b8bb43648 100644 --- a/regression-tests/backends/gpgsql-slave +++ b/regression-tests/backends/gpgsql-slave @@ -10,9 +10,13 @@ launch=gpgsql gpgsql-dbname=$GPGSQL2DB gpgsql-user=$GPGSQL2USER -gpgsql-dnssec __EOF__ + if [[ $context != *nodnssec* ]] + then + echo "gpgsql-dnssec" >> pdns-gpgsql2.conf + fi + for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | tac) do psql --user="$GPGSQL2USER" "$GPGSQL2DB" \ diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave index 00f6490791..486e30bfaf 100644 --- a/regression-tests/backends/gsqlite3-slave +++ b/regression-tests/backends/gsqlite3-slave @@ -6,9 +6,13 @@ launch=gsqlite3 gsqlite3-database=pdns.sqlite32 gsqlite3-pragma-synchronous=0 -gsqlite3-dnssec __EOF__ + if [[ $context != *nodnssec* ]] + then + echo "gsqlite3-dnssec" >> pdns-gsqlite32.conf + fi + for zone in $(grep 'zone ' named.conf | cut -f2 -d\" | tac) do sqlite3 pdns.sqlite32 "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port');" -- 2.47.2