From: Kees Monshouwer Date: Fri, 26 May 2017 20:33:46 +0000 (+0200) Subject: auth: build all tools in travis and fix speedtest build X-Git-Tag: rec-4.1.0-alpha1~94^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F5374%2Fhead;p=thirdparty%2Fpdns.git auth: build all tools in travis and fix speedtest build --- diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh index cc99ef03a2..259a56308e 100755 --- a/build-scripts/travis.sh +++ b/build-scripts/travis.sh @@ -441,7 +441,7 @@ test_auth() { run "test -f modules/remotebackend/test-suite.log && cat modules/remotebackend/test-suite.log || true" #DNSName - make -k -j3 -C pdns $(grep '(EXEEXT):' pdns/Makefile | cut -f1 -d\$ | grep -E -v 'dnsdist|calidns') - run 'make -k -j3 -C pdns $(grep "(EXEEXT):" pdns/Makefile | cut -f1 -d\$ | grep -E -v "dnspcap2protobuf|dnsdist|calidns|speedtest")' + run 'make -k -j3 -C pdns $(grep "(EXEEXT):" pdns/Makefile | cut -f1 -d\$)' run "cd pdns" run "./pdnsutil test-algorithms" diff --git a/pdns/speedtest.cc b/pdns/speedtest.cc index c6b35100fd..d3a1fc15bd 100644 --- a/pdns/speedtest.cc +++ b/pdns/speedtest.cc @@ -265,7 +265,6 @@ vector makeBigDNSPacketReferral() rr.qtype = QType::NS; rr.ttl=3600; rr.qname=DNSName("com"); - rr.d_place = DNSResourceRecord::ADDITIONAL; string gtld="x.gtld-servers.net"; for(char c='a'; c<= 'm';++c) { @@ -297,7 +296,7 @@ vector makeBigDNSPacketReferral() DNSPacketWriter pw(packet, DNSName("www.google.com"), QType::A); // shuffle(records); for(const auto& rec : records) { - pw.startRecord(rec.qname, rec.qtype.getCode(), rec.ttl, 1, rec.d_place); + pw.startRecord(rec.qname, rec.qtype.getCode(), rec.ttl, 1, DNSResourceRecord::ADDITIONAL); auto drc = DNSRecordContent::mastermake(rec.qtype.getCode(), 1, rec.content); drc->toPacket(pw); delete drc; @@ -620,7 +619,6 @@ struct ParsePacketTest rr.ttl=i->first.d_ttl; rr.content=i->first.d_content->getZoneRepresentation(); // this should be the serialised form - rr.d_place=(DNSResourceRecord::Place) i->first.d_place; lwr.d_result.push_back(rr); }