From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Fri, 31 Jul 2015 20:15:02 +0000 (+0200)
Subject: Merge pull request #2660 from mind04/recursor
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~58^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47cd0ebde97e52a7383e1dc7617f2cd4c30b9918;p=thirdparty%2Fpdns.git

Merge pull request #2660 from mind04/recursor

recursor bulktest is back in travis
---

47cd0ebde97e52a7383e1dc7617f2cd4c30b9918
diff --cc .travis.yml
index 4e1a161ceb,aa5337d2a2..b6866fedde
--- a/.travis.yml
+++ b/.travis.yml
@@@ -182,13 -182,13 +182,13 @@@ script
   - rm -f tests/verify-dnssec-zone/allow-missing
   - rm -f tests/verify-dnssec-zone/skip.nsec3
   - rm -f tests/verify-dnssec-zone/skip.optout
- #DNSName - THRESHOLD=90 TRACE=no ./timestamp ./recursor-test 5300
+  - THRESHOLD=90 TRACE=no ./timestamp ./recursor-test 5300
   - cd ../regression-tests.nobackend/
 -#DNSName - ./runtests
 -#DNSName - test ! -s ./failed_tests
 + - ./runtests
 + - test ! -s ./failed_tests
   - cd ..
   - git status
 -# - git status | grep -q clean
 + - git status | grep -q clean
  notifications:
    irc:
      channels: