From: Kees Monshouwer <mind04@monshouwer.org>
Date: Sun, 27 Jul 2014 18:52:15 +0000 (+0200)
Subject: make sure we stay within the 4mb log length limit on travis
X-Git-Tag: auth-3.4.0-rc1~17^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16bff17458ad48beda5dd20a70f08a4f878d2502;p=thirdparty%2Fpdns.git

make sure we stay within the 4mb log length limit on travis
---

diff --git a/.travis.yml b/.travis.yml
index 05fe004c8f..38e9223afe 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -98,7 +98,6 @@ script:
  - cd ../regression-tests.nobackend/
  - ./runtests
  - test ! -s ./failed_tests
- - test ! -s ./failed_tests || (cat /tmp/remotebackend.txt.* | sort)
 notifications:
   irc:
     channels:
diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 429c6c8495..bdc385fd6c 100755
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -78,7 +78,7 @@ if daemon == 'authoritative':
         tf.seek(0, os.SEEK_SET)  # rewind
         subprocess.check_call(["sqlite3", SQLITE_DB], stdin=tf)
 
-    pdnscmd = ("../pdns/pdns_server --daemon=no --local-port=5300 --socket-dir=./ --no-shuffle --launch=gsqlite3 --gsqlite3-dnssec --send-root-referral --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --cache-ttl=0 --no-config --gsqlite3-dnssec=on --gsqlite3-database="+SQLITE_DB+" --experimental-json-interface=yes --webserver=yes --webserver-port="+WEBPORT+" --webserver-address=127.0.0.1 --query-logging --loglevel=9 --webserver-password="+WEBPASSWORD).split()
+    pdnscmd = ("../pdns/pdns_server --daemon=no --local-port=5300 --socket-dir=./ --no-shuffle --launch=gsqlite3 --gsqlite3-dnssec --send-root-referral --allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes --cache-ttl=0 --no-config --gsqlite3-dnssec=on --gsqlite3-database="+SQLITE_DB+" --experimental-json-interface=yes --webserver=yes --webserver-port="+WEBPORT+" --webserver-address=127.0.0.1 --webserver-password="+WEBPASSWORD).split()
 
 else:
     conf_dir = 'rec-conf.d'
diff --git a/regression-tests/backends/remote-master b/regression-tests/backends/remote-master
index 9d9fb81f6a..1b8aa9ddc7 100644
--- a/regression-tests/backends/remote-master
+++ b/regression-tests/backends/remote-master
@@ -106,7 +106,7 @@ EOF
 
 		$RUNWRAPPER $PDNS --daemon=no --local-port=$port --socket-dir=./ \
 			--no-shuffle --launch=remote \
-			--query-logging --loglevel=9 --cache-ttl=$cachettl --experimental-dname-processing --no-config \
+			--cache-ttl=$cachettl --experimental-dname-processing --no-config \
 			--send-root-referral --distributor-threads=1 \
 			--allow-2136-from=127.0.0.0/8 --experimental-rfc2136=yes \
 			--remote-connection-string="$connstr" $remote_add_param &