From: Kees Monshouwer Date: Thu, 23 Jan 2014 21:33:24 +0000 (+0100) Subject: fix context for slave regression test X-Git-Tag: rec-3.6.0-rc1~227^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1227%2Fhead;p=thirdparty%2Fpdns.git fix context for slave regression test --- diff --git a/regression-tests/backends/gmysql-slave b/regression-tests/backends/gmysql-slave index 72d7f58fbb..d1a0c6fb22 100644 --- a/regression-tests/backends/gmysql-slave +++ b/regression-tests/backends/gmysql-slave @@ -1,4 +1,4 @@ - context=${context}-presigned + context=${context}-presigned-gmysql [ -z "$GMYSQL2DB" ] && GMYSQL2DB=pdnstest2 [ -z "$GMYSQL2USER" ] && GMYSQL2USER=root [ -z "$GMYSQL2HOST" ] && GMYSQL2HOST=localhost diff --git a/regression-tests/backends/goracle-slave b/regression-tests/backends/goracle-slave index 10862f2ba4..bc04d87f89 100644 --- a/regression-tests/backends/goracle-slave +++ b/regression-tests/backends/goracle-slave @@ -1,4 +1,4 @@ - context=${context}-presigned + context=${context}-presigned-goracle [ -z "$GORACLE2USER" ] && GORACLE2USER=pdns2 [ -z "$GORACLE2PASSWD" ] && GORACLE2PASSWD=pdns diff --git a/regression-tests/backends/gsqlite3-slave b/regression-tests/backends/gsqlite3-slave index 2e169b80ac..4d8312770f 100644 --- a/regression-tests/backends/gsqlite3-slave +++ b/regression-tests/backends/gsqlite3-slave @@ -1,4 +1,4 @@ - context=${context}-presigned + context=${context}-presigned-gsqlite3 rm -f pdns.sqlite31 sqlite3 pdns.sqlite31 < ../modules/gsqlite3backend/no-dnssec.schema.sqlite3.sql sqlite3 pdns.sqlite31 < ../modules/gsqlite3backend/dnssec.schema.sqlite3.sql diff --git a/regression-tests/backends/oracle-slave b/regression-tests/backends/oracle-slave index 5f0b84adcc..518783e83b 100644 --- a/regression-tests/backends/oracle-slave +++ b/regression-tests/backends/oracle-slave @@ -1,4 +1,4 @@ - context=${context}-presigned + context=${context}-presigned-oracle [ -z "$ORACLE2USER" ] && ORACLE2USER=pdns2 [ -z "$ORACLE2PASSWD" ] && ORACLE2PASSWD=pdns diff --git a/regression-tests/ext/bind-slave b/regression-tests/ext/bind-slave index b66cf90a68..f0afa21981 100644 --- a/regression-tests/ext/bind-slave +++ b/regression-tests/ext/bind-slave @@ -1,5 +1,5 @@ skipreasons="$skipreasons bind" - context=$context-presigned + context=$context-presigned-ext-bind cat > bind-slave.conf << __EOF__ options { directory "./zones"; diff --git a/regression-tests/ext/nsd-slave b/regression-tests/ext/nsd-slave index aa8b23739c..cf8f52ea26 100644 --- a/regression-tests/ext/nsd-slave +++ b/regression-tests/ext/nsd-slave @@ -1,5 +1,5 @@ skipreasons="$skipreasons nsd" - context=$context-presigned + context=$context-presigned-ext-bind cat > nsd-slave.conf << __EOF__ server: ip-address: 127.0.0.1@$((port+100))