move arg function to the testrunner

This allows running a single test. The arg function is needed by core stuff...

diff --git a/pdns/test-nameserver_cc.cc b/pdns/test-nameserver_cc.cc
index c164d78ac64484c0450a291a3f25d201e80297b5..10b0956a7e246877cd3dcd3cc10c9aada9b2abf5 100644 (file)
--- a/pdns/test-nameserver_cc.cc
+++ b/pdns/test-nameserver_cc.cc
@@ -8,17 +8,10 @@
 #include "iputils.hh"
 #include "nameserver.hh"
 #include "statbag.hh"
-#include "arguments.hh"
 #include <utility>
 
 extern vector<ComboAddress> g_localaddresses;
 
-ArgvMap &arg()
-{
-  static ArgvMap theArg;
-  return theArg;
-}
-
 BOOST_AUTO_TEST_SUITE(nameserver_cc)
 
 BOOST_AUTO_TEST_CASE(test_AddressIsUs4) {

diff --git a/pdns/testrunner.cc b/pdns/testrunner.cc
index b4e55adbf58141c8e5c0f22d04701ef1ec2814fa..1c6c7cb1af8306b07b1275c0ae8103e591701ceb 100644 (file)
--- a/pdns/testrunner.cc
+++ b/pdns/testrunner.cc
@@ -6,6 +6,7 @@
 #include "config.h"
 #endif
 #include <boost/test/unit_test.hpp>
+#include "arguments.hh"
 #include "auth-packetcache.hh"
 #include "auth-querycache.hh"
 #include "statbag.hh"
@@ -13,3 +14,8 @@ StatBag S;
 AuthPacketCache PC;
 AuthQueryCache QC;
 
+ArgvMap &arg()
+{
+  static ArgvMap theArg;
+  return theArg;
+}