From: Kees Monshouwer Date: Sat, 12 Apr 2014 14:55:53 +0000 (+0200) Subject: cleanup gsql-master regression test scripts X-Git-Tag: rec-3.6.0-rc1~61^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0a407dcf0baeb0f91b7d7913e0ecb7c4017e92d;p=thirdparty%2Fpdns.git cleanup gsql-master regression test scripts --- diff --git a/regression-tests/backends/gmysql-master b/regression-tests/backends/gmysql-master index 70581bb615..3754619f36 100644 --- a/regression-tests/backends/gmysql-master +++ b/regression-tests/backends/gmysql-master @@ -1,5 +1,5 @@ case $context in - gmysql-nodnssec) + gmysql-nodnssec | gmysql | gmysql-nsec3 | gmysql-nsec3-optout | gmysql-nsec3-narrow) [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root [ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost @@ -22,60 +22,26 @@ gmysql-host=$GMYSQLHOST gmysql-password=$GMYSQLPASSWD __EOF__ - for zone in $(grep 'zone ' named.conf | cut -f2 -d\") - do - ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 - done - - ../pdns/pdnssec --config-dir=. --config-name=gmysql import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. --config-name=gmysql activate-tsig-key tsig.com test master - - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gmysql \ - --master --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --direct-dnskey=yes \ - --cache-ttl=$cachettl --experimental-dname-processing --no-config \ - --gmysql-dbname="$GMYSQLDB" \ - --gmysql-user="$GMYSQLUSER" \ - --gmysql-host="$GMYSQLHOST" \ - --gmysql-password="$GMYSQLPASSWD" & - skipreasons=nodnssec - ;; - - gmysql | gmysql-nsec3 | gmysql-nsec3-optout |gmysql-nsec3-narrow) - [ -z "$GMYSQLDB" ] && GMYSQLDB=pdnstest - [ -z "$GMYSQLUSER" ] && GMYSQLUSER=root - [ -z "$GMYSQLHOST" ] && GMYSQLHOST=localhost - [ -z "$GMYSQLPASSWD" ] && GMYSQLPASSWD='' - - mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" --force drop "$GMYSQLDB" \ - || echo ignoring mysqladmin drop failure - mysqladmin --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" create "$GMYSQLDB" - mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" < ../modules/gmysqlbackend/schema.mysql.sql - - tosql gmysql | mysql --user="$GMYSQLUSER" --password="$GMYSQLPASSWD" --host="$GMYSQLHOST" \ - "$GMYSQLDB" + if [ $context != gmysql-nodnssec ] + then + echo "gmysql-dnssec" >> pdns-gmysql.conf + fi - cat > pdns-gmysql.conf << __EOF__ -launch=gmysql -gmysql-dbname=$GMYSQLDB -gmysql-user=$GMYSQLUSER -gmysql-host=$GMYSQLHOST -gmysql-password=$GMYSQLPASSWD -gmysql-dnssec -__EOF__ for zone in $(grep 'zone ' named.conf | cut -f2 -d\") do - securezone $zone gmysql - if [ $context = gmysql-nsec3 ] || [ $context = gmysql-nsec3-optout ] + if [ $context != gmysql-nodnssec ] then - ../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone "1 $optout 1 abcd" 2>&1 - ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 - elif [ $context = gmysql-nsec3-narrow ] - then - ../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 + securezone $zone gmysql + if [ $context = gmysql-nsec3 ] || [ $context = gmysql-nsec3-optout ] + then + ../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 + elif [ $context = gmysql-nsec3-narrow ] + then + ../pdns/pdnssec --config-dir=. --config-name=gmysql set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 + fi + else ../pdns/pdnssec --config-dir=. --config-name=gmysql rectify-zone $zone 2>&1 fi done @@ -83,15 +49,12 @@ __EOF__ ../pdns/pdnssec --config-dir=. --config-name=gmysql import-tsig-key test $ALGORITHM $KEY ../pdns/pdnssec --config-dir=. --config-name=gmysql activate-tsig-key tsig.com test master - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch --launch+=random --launch+=gmysql --launch+=random --gmysql-dnssec \ + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \ + --config-name=gmysql --socket-dir=./ --no-shuffle \ --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --direct-dnskey=yes \ - --cache-ttl=$cachettl --experimental-dname-processing --no-config \ - --gmysql-dbname="$GMYSQLDB" \ - --gmysql-user="$GMYSQLUSER" \ - --gmysql-host="$GMYSQLHOST" \ - --gmysql-password="$GMYSQLPASSWD" $lua_prequery & + --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ + --cache-ttl=$cachettl --experimental-dname-processing $lua_prequery & + if [ $context = gmysql-nsec3 ] then extracontexts="dnssec nsec3" @@ -104,8 +67,12 @@ __EOF__ then extracontexts="dnssec narrow" skipreasons="narrow" + elif [ $context = gmysql-nodnssec ] + then + skipreasons="nodnssec" else extracontexts="dnssec" + skipreasons="" fi ;; diff --git a/regression-tests/backends/goracle-master b/regression-tests/backends/goracle-master index e2318d8303..7973160a37 100644 --- a/regression-tests/backends/goracle-master +++ b/regression-tests/backends/goracle-master @@ -1,5 +1,5 @@ case $context in - goracle-nodnssec | goracle | goracle-nsec3 | goracle-nsec3-optout) + goracle-nodnssec | goracle | goracle-nsec3 | goracle-nsec3-optout | goracle-nsec3-narrow) [ -z "$GORACLEUSER" ] && GORACLEUSER=pdns [ -z "$GORACLEPASSWD" ] && GORACLEPASSWD=pdns @@ -32,6 +32,10 @@ __EOF__ then ../pdns/pdnssec --config-dir=. --config-name=goracle set-nsec3 $zone "1 $optout 1 abcd" 2>&1 ../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1 + elif [ $context = gmysql-nsec3-narrow ] + then + ../pdns/pdnssec --config-dir=. --config-name=goracle set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1 fi else ../pdns/pdnssec --config-dir=. --config-name=goracle rectify-zone $zone 2>&1 @@ -55,6 +59,10 @@ __EOF__ then extracontexts="dnssec nsec3 nsec3-optout" skipreasons="optout nodyndns" + elif [ $context = goracle-nsec3-narrow ] + then + extracontexts="dnssec narrow" + skipreasons="narrow nodyndns" elif [ $context = goracle-nodnssec ] then skipreasons="nodnssec nodyndns" diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master index d62eac45b1..61f6acd6c1 100644 --- a/regression-tests/backends/gpgsql-master +++ b/regression-tests/backends/gpgsql-master @@ -1,5 +1,5 @@ case $context in - gpgsql-nodnssec) + gpgsql-nodnssec | gpgsql | gpgsql-nsec3 | gpgsql-nsec3-optout | gpgsql-nsec3-narrow) [ -z "$GPGSQLDB" ] && GPGSQLDB=pdnstest [ -z "$GPGSQLUSER" ] && GPGSQLUSER=$(whoami) @@ -15,47 +15,26 @@ gpgsql-dbname=$GPGSQLDB gpgsql-user=$GPGSQLUSER __EOF__ - for zone in $(grep 'zone ' named.conf | cut -f2 -d\") - do - ../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1 - done - - ../pdns/pdnssec --config-dir=. --config-name=gpgsql import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. --config-name=gpgsql activate-tsig-key tsig.com test master - - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gpgsql \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --experimental-dname-processing --no-config \ - --gpgsql-dbname="$GPGSQLDB" \ - --gpgsql-user="$GPGSQLUSER" & - skipreasons="nodnssec nodyndns" - ;; - - - gpgsql | gpgsql-nsec3 | gpgsql-nsec3-optout) - [ -z "$GPGSQLDB" ] && GPGSQLDB=pdnstest - [ -z "$GPGSQLUSER" ] && GPGSQLUSER=$(whoami) - - dropdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring dropdb failure - createdb --user="$GPGSQLUSER" "$GPGSQLDB" || echo ignoring createdb failure # FIXME - psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/schema.pgsql.sql - - tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c + if [ $context != gpgsql-nodnssec ] + then + echo "gpgsql-dnssec" >> pdns-gpgsql.conf + fi - cat > pdns-gpgsql.conf << __EOF__ -launch=gpgsql -gpgsql-dbname=$GPGSQLDB -gpgsql-user=$GPGSQLUSER -gpgsql-dnssec -__EOF__ for zone in $(grep 'zone ' named.conf | cut -f2 -d\") do - securezone $zone gpgsql - if [ $context = gpgsql-nsec3 ] || [ $context = gpgsql-nsec3-optout ] + if [ $context != gpgsql-nodnssec ] then - ../pdns/pdnssec --config-dir=. --config-name=gpgsql set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + securezone $zone gpgsql + if [ $context = gpgsql-nsec3 ] || [ $context = gpgsql-nsec3-optout ] + then + ../pdns/pdnssec --config-dir=. --config-name=gpgsql set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1 + elif [ $context = gpgsql-nsec3-narrow ] + then + ../pdns/pdnssec --config-dir=. --config-name=gpgsql set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1 + fi + else ../pdns/pdnssec --config-dir=. --config-name=gpgsql rectify-zone $zone 2>&1 fi done @@ -63,13 +42,12 @@ __EOF__ ../pdns/pdnssec --config-dir=. --config-name=gpgsql import-tsig-key test $ALGORITHM $KEY ../pdns/pdnssec --config-dir=. --config-name=gpgsql activate-tsig-key tsig.com test master - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gpgsql --gpgsql-dnssec \ + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \ + --config-name=gpgsql --socket-dir=./ --no-shuffle \ --send-root-referral \ --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --experimental-dname-processing --no-config \ - --gpgsql-dbname="$GPGSQLDB" \ - --gpgsql-user="$GPGSQLUSER" $lua_prequery & + --cache-ttl=$cachettl --experimental-dname-processing $lua_prequery & + if [ $context = gpgsql-nsec3 ] then extracontexts="dnssec nsec3" @@ -81,6 +59,10 @@ __EOF__ elif [ $context = gpgsql-nsec3-narrow ] then extracontexts="dnssec narrow" + skipreasons="narrow nodyndns" + elif [ $context = gpgsql-nodnssec ] + then + skipreasons="nodnssec nodyndns" else extracontexts="dnssec" skipreasons="nodyndns" diff --git a/regression-tests/backends/gsqlite3-master b/regression-tests/backends/gsqlite3-master index 1f709894b1..7da351f003 100644 --- a/regression-tests/backends/gsqlite3-master +++ b/regression-tests/backends/gsqlite3-master @@ -1,5 +1,5 @@ case $context in - gsqlite3-nodnssec) + gsqlite3-nodnssec | gsqlite3 | gsqlite3-nsec3 | gsqlite3-nsec3-optout | gsqlite3-nsec3-narrow) rm -f pdns.sqlite3 sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/schema.sqlite3.sql tosql gsqlite | sqlite3 pdns.sqlite3 @@ -9,40 +9,27 @@ case $context in launch=gsqlite3 gsqlite3-database=pdns.sqlite3 __EOF__ - for zone in $(grep 'zone ' named.conf | cut -f2 -d\") - do - ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1 - done - - ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 import-tsig-key test $ALGORITHM $KEY - ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 activate-tsig-key tsig.com test master - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gsqlite3 \ - --send-root-referral \ - --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --experimental-dname-processing --no-config \ - --gsqlite3-database=pdns.sqlite3 & - skipreasons="nodnssec nodyndns" - ;; - - gsqlite3 | gsqlite3-nsec3 | gsqlite3-nsec3-optout) - rm -f pdns.sqlite3 - sqlite3 pdns.sqlite3 < ../modules/gsqlite3backend/schema.sqlite3.sql - tosql gsqlite | sqlite3 pdns.sqlite3 - echo ANALYZE\; | sqlite3 pdns.sqlite3 + if [ $context != gsqlite3-nodnssec ] + then + echo "gsqlite3-dnssec" >> pdns-gsqlite3.conf + fi - cat > pdns-gsqlite3.conf << __EOF__ -launch=gsqlite3 -gsqlite3-database=pdns.sqlite3 -gsqlite3-dnssec -__EOF__ for zone in $(grep 'zone ' named.conf | cut -f2 -d\") do - securezone $zone gsqlite3 - if [ $context = gsqlite3-nsec3 ] || [ $context = gsqlite3-nsec3-optout ] + if [ $context != gsqlite3-nodnssec ] then - ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + securezone $zone gsqlite3 + if [ $context = gsqlite3-nsec3 ] || [ $context = gsqlite3-nsec3-optout ] + then + ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 set-nsec3 $zone "1 $optout 1 abcd" 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1 + elif [ $context = gsqlite3-nsec3-narrow ] + then + ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 set-nsec3 $zone '1 1 1 abcd' narrow 2>&1 + ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1 + fi + else ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 rectify-zone $zone 2>&1 fi done @@ -50,12 +37,12 @@ __EOF__ ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 import-tsig-key test $ALGORITHM $KEY ../pdns/pdnssec --config-dir=. --config-name=gsqlite3 activate-tsig-key tsig.com test master - $RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \ - --no-shuffle --launch=gsqlite3 --gsqlite3-dnssec \ + $RUNWRAPPER $PDNS --daemon=no --local-port=$port --config-dir=. \ + --config-name=gsqlite3 --socket-dir=./ --no-shuffle \ --send-root-referral \ --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \ - --cache-ttl=$cachettl --experimental-dname-processing --no-config \ - --gsqlite3-database=pdns.sqlite3 $lua_prequery & + --cache-ttl=$cachettl --experimental-dname-processing $lua_prequery & + if [ $context = gsqlite3-nsec3 ] then extracontexts="dnssec nsec3" @@ -64,6 +51,13 @@ __EOF__ then extracontexts="dnssec nsec3 nsec3-optout" skipreasons="optout nodyndns" + elif [ $context = gsqlite3-nsec3-narrow ] + then + extracontexts="dnssec narrow" + skipreasons="narrow nodyndns" + elif [ $context = gsqlite3-nodnssec ] + then + skipreasons="nodnssec nodyndns" else extracontexts="dnssec" skipreasons="nodyndns" diff --git a/regression-tests/start-test-stop b/regression-tests/start-test-stop index 42870c440e..96977dc627 100755 --- a/regression-tests/start-test-stop +++ b/regression-tests/start-test-stop @@ -159,20 +159,20 @@ then Usage: ./start-test-stop [] [wait|nowait] [] [] context is one of: -ext-nsd ext-nsd-nsec ext-nsd-nsec3 ext-bind ext-bind-nsec ext-bind-nsec3 bind bind-dnssec bind-dnssec-nsec3 bind-dnssec-nsec3-optout bind-dnssec-nsec3-narrow gmysql-nodnssec gmysql gmysql-nsec3 gmysql-nsec3-optout gmysql-nsec3-narrow -gpgsql-nodnssec gpgsql gpgsql-nsec3 -gsqlite3-nodnssec gsqlite3 gsqlite3-nsec3 -opendbx-sqlite3 -tinydns +goracle-nodnssec goracle goracle-nsec3 goracle-nsec3-optout goracle-nsec3-narrow +gpgsql-nodnssec gpgsql gpgsql-nsec3 gpgsql-nsec3-optout gpgsql-nsec3-narrow +gsqlite3-nodnssec gsqlite3 gsqlite3-nsec3 gsqlite3-nsec3-optout gsqlite3-nsec3-narrow mydns +opendbx-sqlite3 +oracle-nodnssec oracle oracle-nsec3 remotebackend-pipe remotebackend-unix remotebackend-http remotebackend-zeromq remotebackend-pipe-dnssec remotebackend-unix-dnssec remotebackend-http-dnssec remotebackend-zeromq-dnssec #remotebackend-pipe-nsec3 remotebackend-unix-nsec3 remotebackend-http-nsec3 #remotebackend-pipe-nsec3-narrow remotebackend-unix-nsec3-narrow remotebackend-http-nsec3-narrow -goracle-nodnssec goracle goracle-nsec3 goracle-nsec3-optout -oracle-nodnssec oracle oracle-nsec3 +tinydns +#ext-nsd ext-nsd-nsec ext-nsd-nsec3 ext-bind ext-bind-nsec ext-bind-nsec3 * Add -presigned to any ext-nsd, ext-bind, bind, gmysql or gsqlite3 test (except narrow) to test presigned operation.