Zap debug line and undo unrelated change

Signed-off-by: Otto Moerbeek <otto.moerbeek@open-xchange.com>

diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
index 749078e467814bb2428640d8789ed42b1225d366..ca87efa36ecff0003e1a65c0c0c39ab94cb35c97 100644 (file)
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@ -94,7 +94,6 @@ extern "C" void __tsan_acquire(void* addr);
 extern "C" void __tsan_release(void* addr);
 #endif /* defined __has_include */
 #else
-#error XXXX
 #define __tsan_acquire(x)
 #define __tsan_release(x)
 #endif /* __SANITIZE_THREAD__ */

diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index 8fd736450c4f9c2afb5b465857febeaf6fe5a16d..cb9bcdea1592213a32150c834b5f447ec2d3b92b 100755 (executable)
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -161,7 +161,7 @@ if daemon not in ('authoritative', 'recursor') or backend not in ('gmysql', 'gpg
 daemon = sys.argv[1]
 
 pdns_server = os.environ.get("PDNSSERVER", "../pdns/pdns_server")
-pdns_recursor = os.environ.get("PDNSRECURSOR", "../pdns/recursordist/build/pdns_recursor")
+pdns_recursor = os.environ.get("PDNSRECURSOR", "../pdns/recursordist/pdns_recursor")
 common_args = [
     "--daemon=no", "--socket-dir=.", "--config-dir=.",
     "--local-address=127.0.0.1", "--local-port="+str(DNSPORT),