]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
fix axfr source for goracle-slave tests
authorKees Monshouwer <mind04@monshouwer.org>
Sat, 12 Apr 2014 22:51:47 +0000 (00:51 +0200)
committermind04 <mind04@monshouwer.org>
Mon, 14 Apr 2014 06:59:47 +0000 (08:59 +0200)
regression-tests/backends/goracle-slave

index c99480cbfaed101652d85842b873e5927eb6437f..024dad02c45f5fd5928f3c8e5be5ee0c7720b00e 100644 (file)
@@ -22,17 +22,13 @@ __EOF__
                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
        done
 
+       ../pdns/pdnssec --config-dir=. --config-name=goracle2 import-tsig-key test $ALGORITHM $KEY
+       ../pdns/pdnssec --config-dir=. --config-name=goracle2 activate-tsig-key tsig.com test master
        set +e
-       echo $skipreasons | grep -q nodnssec
+       echo $skipreasons | grep -q nolua
        if [ $? -ne 0 ]
        then
-               ../pdns/pdnssec --config-dir=. --config-name=goracle2 import-tsig-key test $ALGORITHM $KEY
-               ../pdns/pdnssec --config-dir=. --config-name=goracle2 activate-tsig-key tsig.com test master
-               echo $skipreasons | grep -q nolua
-               if [ $? -ne 0 ]
-               then
-                       ../pdns/pdnssec --config-dir=. --config-name=goracle2 set-meta stest.com AXFR-SOURCE 127.0.0.2
-               fi
+               ../pdns/pdnssec --config-dir=. --config-name=goracle2 set-meta stest.com AXFR-SOURCE 127.0.0.2
        fi
        set -e