From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 5 Oct 2018 09:26:44 +0000 (+0200)
Subject: Remove delaypipe testing from auth
X-Git-Tag: dnsdist-1.3.3~58^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=94e4d723acf247f02f39312809e988b69ae6e92a;p=pdns

Remove delaypipe testing from auth

Move it to dnsdist, this is the only place where it is used.
---

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 80773cac8..d9ec9a70c 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -50,7 +50,6 @@ EXTRA_DIST = \
 	bind-dnssec.schema.sqlite3.sql \
 	bindparser.h \
 	named.conf.parsertest \
-	delaypipe.hh delaypipe.cc \
 	pdns.service.in \
 	ixfrdist.service.in \
 	ixfrdist.example.yml \
@@ -1276,7 +1275,6 @@ testrunner_SOURCES = \
 	test-base64_cc.cc \
 	test-bindparser_cc.cc \
 	test-common.hh \
-	test-delaypipe_hh.cc \
 	test-dnsrecordcontent.cc \
 	test-distributor_hh.cc \
 	test-dns_random_hh.cc \
diff --git a/pdns/delaypipe.cc b/pdns/delaypipe.cc
index 076b10483..721b61162 100644
--- a/pdns/delaypipe.cc
+++ b/pdns/delaypipe.cc
@@ -24,7 +24,6 @@
 #include "gettime.hh"
 #include <thread>
 #include "threadname.hh"
-#include "dolog.hh"
 
 template<class T>
 ObjectPipe<T>::ObjectPipe()
diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am
index faabe41ee..526b725e1 100644
--- a/pdns/dnsdistdist/Makefile.am
+++ b/pdns/dnsdistdist/Makefile.am
@@ -216,6 +216,7 @@ testrunner_SOURCES = \
 	base64.hh \
 	dns.hh \
 	test-base64_cc.cc \
+	test-delaypipe_hh.cc \
 	test-dnscrypt_cc.cc \
 	test-dnsdist_cc.cc \
 	test-dnsdistpacketcache_cc.cc \
@@ -245,6 +246,7 @@ testrunner_SOURCES = \
 	sholder.hh \
 	sodcrypto.cc \
 	sstuff.hh \
+	threadname.hh threadname.cc \
 	testrunner.cc \
 	xpf.cc xpf.hh
 
diff --git a/pdns/test-delaypipe_hh.cc b/pdns/dnsdistdist/test-delaypipe_hh.cc
similarity index 100%
rename from pdns/test-delaypipe_hh.cc
rename to pdns/dnsdistdist/test-delaypipe_hh.cc