From 1c2d079d59d677a8be93080b88fe7ae58f331a27 Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Thu, 23 Nov 2023 10:54:19 +0100 Subject: [PATCH] Fix test warnings regarding boost dynamic linking define Meson passes BOOST_TEST_DYN_LINK through the command line so there's no need to re-define it in each test file. Otherwise the compiler warns about the redefinition. warning: "BOOST_TEST_DYN_LINK" redefined 1 | #define BOOST_TEST_DYN_LINK | : note: this is the location of the previous definition --- modules/remotebackend/test-remotebackend-http.cc | 3 +++ modules/remotebackend/test-remotebackend-json.cc | 3 +++ modules/remotebackend/test-remotebackend-pipe.cc | 3 +++ modules/remotebackend/test-remotebackend-post.cc | 3 +++ modules/remotebackend/test-remotebackend-unix.cc | 3 +++ modules/remotebackend/test-remotebackend-zeromq.cc | 3 +++ modules/remotebackend/test-remotebackend.cc | 3 +++ pdns/dnsdistdist/test-connectionmanagement_hh.cc | 4 +++- pdns/dnsdistdist/test-delaypipe_hh.cc | 3 +++ pdns/dnsdistdist/test-dnsdist-connections-cache.cc | 3 +++ pdns/dnsdistdist/test-dnsdist-dnsparser.cc | 3 +++ pdns/dnsdistdist/test-dnsdist-lua-ffi.cc | 3 +++ pdns/dnsdistdist/test-dnsdistasync.cc | 3 +++ pdns/dnsdistdist/test-dnsdistbackend_cc.cc | 3 +++ pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc | 3 +++ pdns/dnsdistdist/test-dnsdistedns.cc | 3 +++ pdns/dnsdistdist/test-dnsdistkvs_cc.cc | 3 +++ pdns/dnsdistdist/test-dnsdistlbpolicies_cc.cc | 3 +++ pdns/dnsdistdist/test-dnsdistluanetwork.cc | 3 +++ pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc | 3 +++ pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc | 3 +++ pdns/dnsdistdist/test-dnsdistrings_cc.cc | 3 +++ pdns/dnsdistdist/test-dnsdistrules_cc.cc | 3 +++ pdns/dnsdistdist/test-dnsdistsvc_cc.cc | 3 +++ pdns/dnsdistdist/test-dnsdisttcp_cc.cc | 3 +++ pdns/dnsdistdist/testrunner.cc | 3 +++ pdns/recursordist/test-aggressive_nsec_cc.cc | 3 +++ pdns/recursordist/test-ednsoptions_cc.cc | 3 +++ pdns/recursordist/test-filterpo_cc.cc | 3 +++ pdns/recursordist/test-histogram_hh.cc | 3 +++ pdns/recursordist/test-mtasker.cc | 3 +++ pdns/recursordist/test-negcache_cc.cc | 3 +++ pdns/recursordist/test-nod_cc.cc | 3 +++ pdns/recursordist/test-rec-taskqueue.cc | 3 +++ pdns/recursordist/test-rec-tcounters_cc.cc | 3 +++ pdns/recursordist/test-rec-zonetocache.cc | 3 +++ pdns/recursordist/test-recpacketcache_cc.cc | 3 +++ pdns/recursordist/test-recursorcache_cc.cc | 3 +++ pdns/recursordist/test-reczones-helpers.cc | 3 +++ pdns/recursordist/test-secpoll_cc.cc | 3 +++ pdns/recursordist/test-settings.cc | 3 +++ pdns/recursordist/test-syncres_cc.cc | 3 +++ pdns/recursordist/test-syncres_cc1.cc | 3 +++ pdns/recursordist/test-syncres_cc10.cc | 3 +++ pdns/recursordist/test-syncres_cc2.cc | 3 +++ pdns/recursordist/test-syncres_cc3.cc | 3 +++ pdns/recursordist/test-syncres_cc4.cc | 3 +++ pdns/recursordist/test-syncres_cc5.cc | 3 +++ pdns/recursordist/test-syncres_cc6.cc | 3 +++ pdns/recursordist/test-syncres_cc7.cc | 3 +++ pdns/recursordist/test-syncres_cc8.cc | 3 +++ pdns/recursordist/test-syncres_cc9.cc | 3 +++ pdns/recursordist/testrunner.cc | 2 ++ pdns/test-arguments_cc.cc | 3 +++ pdns/test-auth-zonecache_cc.cc | 4 +++- pdns/test-base32_cc.cc | 3 +++ pdns/test-base64_cc.cc | 3 +++ pdns/test-bindparser_cc.cc | 3 +++ pdns/test-channel.cc | 3 +++ pdns/test-communicator_hh.cc | 3 +++ pdns/test-credentials_cc.cc | 3 +++ pdns/test-digests_hh.cc | 3 +++ pdns/test-distributor_hh.cc | 3 +++ pdns/test-dns_random_hh.cc | 3 +++ pdns/test-dnscrypt_cc.cc | 3 +++ pdns/test-dnsdist_cc.cc | 3 +++ pdns/test-dnsdistpacketcache_cc.cc | 3 +++ pdns/test-dnsname_cc.cc | 4 ++++ pdns/test-dnsparser_cc.cc | 3 +++ pdns/test-dnsparser_hh.cc | 3 +++ pdns/test-dnsrecordcontent.cc | 3 +++ pdns/test-dnsrecords_cc.cc | 4 ++++ pdns/test-dnswriter_cc.cc | 3 +++ pdns/test-ednscookie_cc.cc | 3 +++ pdns/test-ipcrypt_cc.cc | 3 +++ pdns/test-iputils_hh.cc | 4 ++++ pdns/test-ixfr_cc.cc | 3 +++ pdns/test-lock_hh.cc | 3 +++ pdns/test-lua_auth4_cc.cc | 3 +++ pdns/test-luawrapper.cc | 4 ++++ pdns/test-misc_hh.cc | 3 +++ pdns/test-mplexer.cc | 4 +++- pdns/test-nameserver_cc.cc | 3 +++ pdns/test-packetcache_cc.cc | 3 +++ pdns/test-packetcache_hh.cc | 3 +++ pdns/test-proxy_protocol_cc.cc | 4 ++++ pdns/test-rcpgenerator_cc.cc | 3 +++ pdns/test-sha_hh.cc | 4 ++++ pdns/test-sholder_hh.cc | 3 +++ pdns/test-signers.cc | 4 ++++ pdns/test-statbag_cc.cc | 3 +++ pdns/test-svc_records_cc.cc | 4 ++++ pdns/test-trusted-notification-proxy_cc.cc | 4 ++++ pdns/test-tsig.cc | 3 +++ pdns/test-ueberbackend_cc.cc | 3 +++ pdns/test-webserver_cc.cc | 3 +++ pdns/test-zonemd_cc.cc | 4 ++++ pdns/test-zoneparser_tng_cc.cc | 4 ++++ pdns/testrunner.cc | 2 ++ 99 files changed, 306 insertions(+), 3 deletions(-) diff --git a/modules/remotebackend/test-remotebackend-http.cc b/modules/remotebackend/test-remotebackend-http.cc index d7b967009a5a..7d7646ed1382 100644 --- a/modules/remotebackend/test-remotebackend-http.cc +++ b/modules/remotebackend/test-remotebackend-http.cc @@ -55,7 +55,10 @@ class RemoteLoader std::unique_ptr backendUnderTest; +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit diff --git a/modules/remotebackend/test-remotebackend-json.cc b/modules/remotebackend/test-remotebackend-json.cc index 7291d45e459e..ec85e16852d3 100644 --- a/modules/remotebackend/test-remotebackend-json.cc +++ b/modules/remotebackend/test-remotebackend-json.cc @@ -53,7 +53,10 @@ class RemoteLoader std::unique_ptr backendUnderTest; +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit diff --git a/modules/remotebackend/test-remotebackend-pipe.cc b/modules/remotebackend/test-remotebackend-pipe.cc index c643533d461e..6165adb2c022 100644 --- a/modules/remotebackend/test-remotebackend-pipe.cc +++ b/modules/remotebackend/test-remotebackend-pipe.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit diff --git a/modules/remotebackend/test-remotebackend-post.cc b/modules/remotebackend/test-remotebackend-post.cc index fcae528e3777..47107149e057 100644 --- a/modules/remotebackend/test-remotebackend-post.cc +++ b/modules/remotebackend/test-remotebackend-post.cc @@ -53,7 +53,10 @@ class RemoteLoader std::unique_ptr backendUnderTest; +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit diff --git a/modules/remotebackend/test-remotebackend-unix.cc b/modules/remotebackend/test-remotebackend-unix.cc index 5c16564e3e44..09651e757948 100644 --- a/modules/remotebackend/test-remotebackend-unix.cc +++ b/modules/remotebackend/test-remotebackend-unix.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit diff --git a/modules/remotebackend/test-remotebackend-zeromq.cc b/modules/remotebackend/test-remotebackend-zeromq.cc index e7f65cda1d0d..a0e7e00d185f 100644 --- a/modules/remotebackend/test-remotebackend-zeromq.cc +++ b/modules/remotebackend/test-remotebackend-zeromq.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit diff --git a/modules/remotebackend/test-remotebackend.cc b/modules/remotebackend/test-remotebackend.cc index 566390aa915d..ebbb636cc8af 100644 --- a/modules/remotebackend/test-remotebackend.cc +++ b/modules/remotebackend/test-remotebackend.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/dnsdistdist/test-connectionmanagement_hh.cc b/pdns/dnsdistdist/test-connectionmanagement_hh.cc index 83205183c329..7ebaf3114e96 100644 --- a/pdns/dnsdistdist/test-connectionmanagement_hh.cc +++ b/pdns/dnsdistdist/test-connectionmanagement_hh.cc @@ -1,5 +1,7 @@ - +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-delaypipe_hh.cc b/pdns/dnsdistdist/test-delaypipe_hh.cc index 41040a906f33..4bc0b02af936 100644 --- a/pdns/dnsdistdist/test-delaypipe_hh.cc +++ b/pdns/dnsdistdist/test-delaypipe_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/dnsdistdist/test-dnsdist-connections-cache.cc b/pdns/dnsdistdist/test-dnsdist-connections-cache.cc index 024d9db94059..b6f86b6525ee 100644 --- a/pdns/dnsdistdist/test-dnsdist-connections-cache.cc +++ b/pdns/dnsdistdist/test-dnsdist-connections-cache.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdist-dnsparser.cc b/pdns/dnsdistdist/test-dnsdist-dnsparser.cc index 52f8076c30f4..a7bb4e37b39a 100644 --- a/pdns/dnsdistdist/test-dnsdist-dnsparser.cc +++ b/pdns/dnsdistdist/test-dnsdist-dnsparser.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdist-lua-ffi.cc b/pdns/dnsdistdist/test-dnsdist-lua-ffi.cc index 72b3d383087e..b67d91920c03 100644 --- a/pdns/dnsdistdist/test-dnsdist-lua-ffi.cc +++ b/pdns/dnsdistdist/test-dnsdist-lua-ffi.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistasync.cc b/pdns/dnsdistdist/test-dnsdistasync.cc index 044d5a02f30f..e535ba3cb4d6 100644 --- a/pdns/dnsdistdist/test-dnsdistasync.cc +++ b/pdns/dnsdistdist/test-dnsdistasync.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistbackend_cc.cc b/pdns/dnsdistdist/test-dnsdistbackend_cc.cc index 983f91289ae7..34745f4228be 100644 --- a/pdns/dnsdistdist/test-dnsdistbackend_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistbackend_cc.cc @@ -1,5 +1,8 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc b/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc index 46f9916b715b..fbb7f38ec1c9 100644 --- a/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc +++ b/pdns/dnsdistdist/test-dnsdistdynblocks_hh.cc @@ -1,5 +1,8 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistedns.cc b/pdns/dnsdistdist/test-dnsdistedns.cc index 93e0e0080bca..603bc3eca694 100644 --- a/pdns/dnsdistdist/test-dnsdistedns.cc +++ b/pdns/dnsdistdist/test-dnsdistedns.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistkvs_cc.cc b/pdns/dnsdistdist/test-dnsdistkvs_cc.cc index 8c5d756d1b8f..7177d67f4f3e 100644 --- a/pdns/dnsdistdist/test-dnsdistkvs_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistkvs_cc.cc @@ -1,5 +1,8 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistlbpolicies_cc.cc b/pdns/dnsdistdist/test-dnsdistlbpolicies_cc.cc index 9d437578f77f..94594bd17bf0 100644 --- a/pdns/dnsdistdist/test-dnsdistlbpolicies_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistlbpolicies_cc.cc @@ -1,5 +1,8 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistluanetwork.cc b/pdns/dnsdistdist/test-dnsdistluanetwork.cc index 125541857672..6ddc4a200587 100644 --- a/pdns/dnsdistdist/test-dnsdistluanetwork.cc +++ b/pdns/dnsdistdist/test-dnsdistluanetwork.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc b/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc index 27364fa3708b..49a891d8560a 100644 --- a/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistnghttp2-in_cc.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc b/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc index 2d86c9700614..50222414a22b 100644 --- a/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistnghttp2_cc.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistrings_cc.cc b/pdns/dnsdistdist/test-dnsdistrings_cc.cc index a642a951b547..77450c8b051d 100644 --- a/pdns/dnsdistdist/test-dnsdistrings_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistrings_cc.cc @@ -1,5 +1,8 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistrules_cc.cc b/pdns/dnsdistdist/test-dnsdistrules_cc.cc index b636ea922fb3..b709bd48168a 100644 --- a/pdns/dnsdistdist/test-dnsdistrules_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistrules_cc.cc @@ -1,5 +1,8 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdistsvc_cc.cc b/pdns/dnsdistdist/test-dnsdistsvc_cc.cc index a7cad91b751a..6350f3ae5c29 100644 --- a/pdns/dnsdistdist/test-dnsdistsvc_cc.cc +++ b/pdns/dnsdistdist/test-dnsdistsvc_cc.cc @@ -1,5 +1,8 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc index 14a13cde8a2e..eacadf0401a2 100644 --- a/pdns/dnsdistdist/test-dnsdisttcp_cc.cc +++ b/pdns/dnsdistdist/test-dnsdisttcp_cc.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/dnsdistdist/testrunner.cc b/pdns/dnsdistdist/testrunner.cc index b6a685288678..66b82aaf6963 100644 --- a/pdns/dnsdistdist/testrunner.cc +++ b/pdns/dnsdistdist/testrunner.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_MAIN #define BOOST_TEST_MODULE unit diff --git a/pdns/recursordist/test-aggressive_nsec_cc.cc b/pdns/recursordist/test-aggressive_nsec_cc.cc index 249e9b561f74..74e6706ecda9 100644 --- a/pdns/recursordist/test-aggressive_nsec_cc.cc +++ b/pdns/recursordist/test-aggressive_nsec_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "aggressive_nsec.hh" diff --git a/pdns/recursordist/test-ednsoptions_cc.cc b/pdns/recursordist/test-ednsoptions_cc.cc index 5878022cb009..7c99d5af7b32 100644 --- a/pdns/recursordist/test-ednsoptions_cc.cc +++ b/pdns/recursordist/test-ednsoptions_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/recursordist/test-filterpo_cc.cc b/pdns/recursordist/test-filterpo_cc.cc index dec12ad460e7..f91abdf07570 100644 --- a/pdns/recursordist/test-filterpo_cc.cc +++ b/pdns/recursordist/test-filterpo_cc.cc @@ -1,5 +1,8 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/recursordist/test-histogram_hh.cc b/pdns/recursordist/test-histogram_hh.cc index b336df55d55d..a88013adf5bc 100644 --- a/pdns/recursordist/test-histogram_hh.cc +++ b/pdns/recursordist/test-histogram_hh.cc @@ -20,7 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/recursordist/test-mtasker.cc b/pdns/recursordist/test-mtasker.cc index 18a9620c7df9..54053024ba77 100644 --- a/pdns/recursordist/test-mtasker.cc +++ b/pdns/recursordist/test-mtasker.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/recursordist/test-negcache_cc.cc b/pdns/recursordist/test-negcache_cc.cc index dc01f55585a4..f6ce64c4a60b 100644 --- a/pdns/recursordist/test-negcache_cc.cc +++ b/pdns/recursordist/test-negcache_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/recursordist/test-nod_cc.cc b/pdns/recursordist/test-nod_cc.cc index d76457041940..d7700f7d2455 100644 --- a/pdns/recursordist/test-nod_cc.cc +++ b/pdns/recursordist/test-nod_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include #include "nod.hh" diff --git a/pdns/recursordist/test-rec-taskqueue.cc b/pdns/recursordist/test-rec-taskqueue.cc index b025a40fe346..00f2bd0b47aa 100644 --- a/pdns/recursordist/test-rec-taskqueue.cc +++ b/pdns/recursordist/test-rec-taskqueue.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include diff --git a/pdns/recursordist/test-rec-tcounters_cc.cc b/pdns/recursordist/test-rec-tcounters_cc.cc index bdeede0699b1..82faf5343096 100644 --- a/pdns/recursordist/test-rec-tcounters_cc.cc +++ b/pdns/recursordist/test-rec-tcounters_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/recursordist/test-rec-zonetocache.cc b/pdns/recursordist/test-rec-zonetocache.cc index 12c0a6dc9aa6..48bc20c7f2c1 100644 --- a/pdns/recursordist/test-rec-zonetocache.cc +++ b/pdns/recursordist/test-rec-zonetocache.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include diff --git a/pdns/recursordist/test-recpacketcache_cc.cc b/pdns/recursordist/test-recpacketcache_cc.cc index 353407ea276f..df74d9a7430d 100644 --- a/pdns/recursordist/test-recpacketcache_cc.cc +++ b/pdns/recursordist/test-recpacketcache_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/recursordist/test-recursorcache_cc.cc b/pdns/recursordist/test-recursorcache_cc.cc index 71a05440eecb..27b6e907386a 100644 --- a/pdns/recursordist/test-recursorcache_cc.cc +++ b/pdns/recursordist/test-recursorcache_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/recursordist/test-reczones-helpers.cc b/pdns/recursordist/test-reczones-helpers.cc index 8693625a985b..a010c13fea31 100644 --- a/pdns/recursordist/test-reczones-helpers.cc +++ b/pdns/recursordist/test-reczones-helpers.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include diff --git a/pdns/recursordist/test-secpoll_cc.cc b/pdns/recursordist/test-secpoll_cc.cc index 07660b08a8ce..f3b9f2582043 100644 --- a/pdns/recursordist/test-secpoll_cc.cc +++ b/pdns/recursordist/test-secpoll_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/recursordist/test-settings.cc b/pdns/recursordist/test-settings.cc index 779684e4d256..f94dbf6c1dc0 100644 --- a/pdns/recursordist/test-settings.cc +++ b/pdns/recursordist/test-settings.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include diff --git a/pdns/recursordist/test-syncres_cc.cc b/pdns/recursordist/test-syncres_cc.cc index 50e45a80f2e6..1fd0a87d838c 100644 --- a/pdns/recursordist/test-syncres_cc.cc +++ b/pdns/recursordist/test-syncres_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "aggressive_nsec.hh" diff --git a/pdns/recursordist/test-syncres_cc1.cc b/pdns/recursordist/test-syncres_cc1.cc index 3676524d3c09..372f07873fb5 100644 --- a/pdns/recursordist/test-syncres_cc1.cc +++ b/pdns/recursordist/test-syncres_cc1.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/test-syncres_cc10.cc b/pdns/recursordist/test-syncres_cc10.cc index cefe3fd49ddb..d43570f0e6b5 100644 --- a/pdns/recursordist/test-syncres_cc10.cc +++ b/pdns/recursordist/test-syncres_cc10.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/test-syncres_cc2.cc b/pdns/recursordist/test-syncres_cc2.cc index 7f761238f03c..d2790a9f4f57 100644 --- a/pdns/recursordist/test-syncres_cc2.cc +++ b/pdns/recursordist/test-syncres_cc2.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/test-syncres_cc3.cc b/pdns/recursordist/test-syncres_cc3.cc index 7acdb4f4ca65..431f5cc5a005 100644 --- a/pdns/recursordist/test-syncres_cc3.cc +++ b/pdns/recursordist/test-syncres_cc3.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/test-syncres_cc4.cc b/pdns/recursordist/test-syncres_cc4.cc index 3e02e501bc12..42818c3da00d 100644 --- a/pdns/recursordist/test-syncres_cc4.cc +++ b/pdns/recursordist/test-syncres_cc4.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/test-syncres_cc5.cc b/pdns/recursordist/test-syncres_cc5.cc index 367a68a6cee1..7f5369729062 100644 --- a/pdns/recursordist/test-syncres_cc5.cc +++ b/pdns/recursordist/test-syncres_cc5.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/test-syncres_cc6.cc b/pdns/recursordist/test-syncres_cc6.cc index bae815c34d17..44297eadd8b5 100644 --- a/pdns/recursordist/test-syncres_cc6.cc +++ b/pdns/recursordist/test-syncres_cc6.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/test-syncres_cc7.cc b/pdns/recursordist/test-syncres_cc7.cc index df5fb0850aac..6a64a52028b7 100644 --- a/pdns/recursordist/test-syncres_cc7.cc +++ b/pdns/recursordist/test-syncres_cc7.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/test-syncres_cc8.cc b/pdns/recursordist/test-syncres_cc8.cc index 2026f607fb71..a557ee48a20a 100644 --- a/pdns/recursordist/test-syncres_cc8.cc +++ b/pdns/recursordist/test-syncres_cc8.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/test-syncres_cc9.cc b/pdns/recursordist/test-syncres_cc9.cc index 5a2dfab2c525..f4c8c04ff074 100644 --- a/pdns/recursordist/test-syncres_cc9.cc +++ b/pdns/recursordist/test-syncres_cc9.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #include #include "test-syncres_cc.hh" diff --git a/pdns/recursordist/testrunner.cc b/pdns/recursordist/testrunner.cc index fb4b0ec396c5..125cacd8314e 100644 --- a/pdns/recursordist/testrunner.cc +++ b/pdns/recursordist/testrunner.cc @@ -19,7 +19,9 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-arguments_cc.cc b/pdns/test-arguments_cc.cc index 2e31cfb2cfc9..73dbbc4ef893 100644 --- a/pdns/test-arguments_cc.cc +++ b/pdns/test-arguments_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-auth-zonecache_cc.cc b/pdns/test-auth-zonecache_cc.cc index de183ab4259b..692a49175016 100644 --- a/pdns/test-auth-zonecache_cc.cc +++ b/pdns/test-auth-zonecache_cc.cc @@ -1,4 +1,3 @@ - /* PowerDNS Versatile Database Driven Nameserver Copyright (C) 2021 PowerDNS.COM BV @@ -21,7 +20,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-base32_cc.cc b/pdns/test-base32_cc.cc index 1680bc460391..40c3bdedb4da 100644 --- a/pdns/test-base32_cc.cc +++ b/pdns/test-base32_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-base64_cc.cc b/pdns/test-base64_cc.cc index 2f694b1b120c..d246b0d18e97 100644 --- a/pdns/test-base64_cc.cc +++ b/pdns/test-base64_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-bindparser_cc.cc b/pdns/test-bindparser_cc.cc index 9a918b36c7d5..ff37fcf117df 100644 --- a/pdns/test-bindparser_cc.cc +++ b/pdns/test-bindparser_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-channel.cc b/pdns/test-channel.cc index 8bd042122e04..75c5a598f27b 100644 --- a/pdns/test-channel.cc +++ b/pdns/test-channel.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/test-communicator_hh.cc b/pdns/test-communicator_hh.cc index 427846fb095c..9d389bcf3b43 100644 --- a/pdns/test-communicator_hh.cc +++ b/pdns/test-communicator_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-credentials_cc.cc b/pdns/test-credentials_cc.cc index 109f2b0c7b53..ae71485818f9 100644 --- a/pdns/test-credentials_cc.cc +++ b/pdns/test-credentials_cc.cc @@ -1,5 +1,8 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/test-digests_hh.cc b/pdns/test-digests_hh.cc index 79ab4d73ba78..124b525b0ca7 100644 --- a/pdns/test-digests_hh.cc +++ b/pdns/test-digests_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-distributor_hh.cc b/pdns/test-distributor_hh.cc index 679b1fa6c29c..14527c06ab28 100644 --- a/pdns/test-distributor_hh.cc +++ b/pdns/test-distributor_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-dns_random_hh.cc b/pdns/test-dns_random_hh.cc index d41f0d4b0223..8d525424465f 100644 --- a/pdns/test-dns_random_hh.cc +++ b/pdns/test-dns_random_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-dnscrypt_cc.cc b/pdns/test-dnscrypt_cc.cc index f19010c738ae..5df51acc58db 100644 --- a/pdns/test-dnscrypt_cc.cc +++ b/pdns/test-dnscrypt_cc.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/test-dnsdist_cc.cc b/pdns/test-dnsdist_cc.cc index c51a930c04f8..56f31d2348b1 100644 --- a/pdns/test-dnsdist_cc.cc +++ b/pdns/test-dnsdist_cc.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/test-dnsdistpacketcache_cc.cc b/pdns/test-dnsdistpacketcache_cc.cc index 63a86fef7694..14fceb06fac5 100644 --- a/pdns/test-dnsdistpacketcache_cc.cc +++ b/pdns/test-dnsdistpacketcache_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/test-dnsname_cc.cc b/pdns/test-dnsname_cc.cc index b3b442a46df6..6498e3dfa99d 100644 --- a/pdns/test-dnsname_cc.cc +++ b/pdns/test-dnsname_cc.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #include #include diff --git a/pdns/test-dnsparser_cc.cc b/pdns/test-dnsparser_cc.cc index 05894f3343a3..79da18a27cbe 100644 --- a/pdns/test-dnsparser_cc.cc +++ b/pdns/test-dnsparser_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-dnsparser_hh.cc b/pdns/test-dnsparser_hh.cc index 61657430caf7..422eda576226 100644 --- a/pdns/test-dnsparser_hh.cc +++ b/pdns/test-dnsparser_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-dnsrecordcontent.cc b/pdns/test-dnsrecordcontent.cc index b5811dafa4fe..d3488e65dc69 100644 --- a/pdns/test-dnsrecordcontent.cc +++ b/pdns/test-dnsrecordcontent.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-dnsrecords_cc.cc b/pdns/test-dnsrecords_cc.cc index e3c5fe1e3305..3e65d783f73c 100644 --- a/pdns/test-dnsrecords_cc.cc +++ b/pdns/test-dnsrecords_cc.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pdns/test-dnswriter_cc.cc b/pdns/test-dnswriter_cc.cc index bef0a81c6146..b7cee5a0fb4f 100644 --- a/pdns/test-dnswriter_cc.cc +++ b/pdns/test-dnswriter_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-ednscookie_cc.cc b/pdns/test-ednscookie_cc.cc index 556429fcfb43..e6c6d5bc87eb 100644 --- a/pdns/test-ednscookie_cc.cc +++ b/pdns/test-ednscookie_cc.cc @@ -19,7 +19,10 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-ipcrypt_cc.cc b/pdns/test-ipcrypt_cc.cc index fe3897ad5a40..837d394e7c2f 100644 --- a/pdns/test-ipcrypt_cc.cc +++ b/pdns/test-ipcrypt_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-iputils_hh.cc b/pdns/test-iputils_hh.cc index da21868b06f7..b30df736472c 100644 --- a/pdns/test-iputils_hh.cc +++ b/pdns/test-iputils_hh.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pdns/test-ixfr_cc.cc b/pdns/test-ixfr_cc.cc index 48127d3cd653..421e59598419 100644 --- a/pdns/test-ixfr_cc.cc +++ b/pdns/test-ixfr_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-lock_hh.cc b/pdns/test-lock_hh.cc index 112be6f016a6..00669cc380f3 100644 --- a/pdns/test-lock_hh.cc +++ b/pdns/test-lock_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H #include "config.h" diff --git a/pdns/test-lua_auth4_cc.cc b/pdns/test-lua_auth4_cc.cc index 7fdf4f1f4188..3bf05b5c7860 100644 --- a/pdns/test-lua_auth4_cc.cc +++ b/pdns/test-lua_auth4_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-luawrapper.cc b/pdns/test-luawrapper.cc index 10047902318e..dd01254db909 100644 --- a/pdns/test-luawrapper.cc +++ b/pdns/test-luawrapper.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pdns/test-misc_hh.cc b/pdns/test-misc_hh.cc index b3f0b3a4c223..bb903d623605 100644 --- a/pdns/test-misc_hh.cc +++ b/pdns/test-misc_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-mplexer.cc b/pdns/test-mplexer.cc index 4c2b44d9bad6..20a2365bec2a 100644 --- a/pdns/test-mplexer.cc +++ b/pdns/test-mplexer.cc @@ -1,5 +1,7 @@ - +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/test-nameserver_cc.cc b/pdns/test-nameserver_cc.cc index 0517b076f67b..0dccf727731d 100644 --- a/pdns/test-nameserver_cc.cc +++ b/pdns/test-nameserver_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-packetcache_cc.cc b/pdns/test-packetcache_cc.cc index 4b3a39936a1e..166a11dab4a7 100644 --- a/pdns/test-packetcache_cc.cc +++ b/pdns/test-packetcache_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-packetcache_hh.cc b/pdns/test-packetcache_hh.cc index e43627310cc5..8d1bc24dfe3e 100644 --- a/pdns/test-packetcache_hh.cc +++ b/pdns/test-packetcache_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-proxy_protocol_cc.cc b/pdns/test-proxy_protocol_cc.cc index 6a672c4dac01..7cee098d8377 100644 --- a/pdns/test-proxy_protocol_cc.cc +++ b/pdns/test-proxy_protocol_cc.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #include #include "iputils.hh" diff --git a/pdns/test-rcpgenerator_cc.cc b/pdns/test-rcpgenerator_cc.cc index 0987108e2287..c78495bcd64e 100644 --- a/pdns/test-rcpgenerator_cc.cc +++ b/pdns/test-rcpgenerator_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-sha_hh.cc b/pdns/test-sha_hh.cc index a0753bc9a6a7..8eebf5f943c5 100644 --- a/pdns/test-sha_hh.cc +++ b/pdns/test-sha_hh.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pdns/test-sholder_hh.cc b/pdns/test-sholder_hh.cc index cf0d70662381..3ca40e462543 100644 --- a/pdns/test-sholder_hh.cc +++ b/pdns/test-sholder_hh.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/test-signers.cc b/pdns/test-signers.cc index f92fedb17487..456573d9c72c 100644 --- a/pdns/test-signers.cc +++ b/pdns/test-signers.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pdns/test-statbag_cc.cc b/pdns/test-statbag_cc.cc index 4a36d38fc232..bbde1705e2be 100644 --- a/pdns/test-statbag_cc.cc +++ b/pdns/test-statbag_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-svc_records_cc.cc b/pdns/test-svc_records_cc.cc index 98b41d25b7de..bb7f08d2efea 100644 --- a/pdns/test-svc_records_cc.cc +++ b/pdns/test-svc_records_cc.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pdns/test-trusted-notification-proxy_cc.cc b/pdns/test-trusted-notification-proxy_cc.cc index 689e5c86cc09..b477683c9aa3 100644 --- a/pdns/test-trusted-notification-proxy_cc.cc +++ b/pdns/test-trusted-notification-proxy_cc.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #include #include "trusted-notification-proxy.hh" diff --git a/pdns/test-tsig.cc b/pdns/test-tsig.cc index 8dc1ac868baa..08c90828dea9 100644 --- a/pdns/test-tsig.cc +++ b/pdns/test-tsig.cc @@ -21,7 +21,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-ueberbackend_cc.cc b/pdns/test-ueberbackend_cc.cc index 1bde35389a10..b6a1cc3c12d2 100644 --- a/pdns/test-ueberbackend_cc.cc +++ b/pdns/test-ueberbackend_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #ifdef HAVE_CONFIG_H diff --git a/pdns/test-webserver_cc.cc b/pdns/test-webserver_cc.cc index 5003dbb220c6..c0f8335a8793 100644 --- a/pdns/test-webserver_cc.cc +++ b/pdns/test-webserver_cc.cc @@ -1,4 +1,7 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN #include diff --git a/pdns/test-zonemd_cc.cc b/pdns/test-zonemd_cc.cc index 08c282c7db04..3743dd17e730 100644 --- a/pdns/test-zonemd_cc.cc +++ b/pdns/test-zonemd_cc.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #include #include "zonemd.hh" diff --git a/pdns/test-zoneparser_tng_cc.cc b/pdns/test-zoneparser_tng_cc.cc index 78f273162fc8..2502db32f300 100644 --- a/pdns/test-zoneparser_tng_cc.cc +++ b/pdns/test-zoneparser_tng_cc.cc @@ -1,5 +1,9 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif + #define BOOST_TEST_NO_MAIN + #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/pdns/testrunner.cc b/pdns/testrunner.cc index 0a7255e1c6bf..ef4f16a014e7 100644 --- a/pdns/testrunner.cc +++ b/pdns/testrunner.cc @@ -1,4 +1,6 @@ +#ifndef BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK +#endif #ifdef HAVE_CONFIG_H #include "config.h"