From 4cd373aea8d20356727f7d65e0bc818beb6523dc Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Tue, 29 Nov 2016 18:45:24 -0800
Subject: Un-expose mapArgs from utils.h

---
 src/qt/test/rpcnestedtests.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/qt/test/rpcnestedtests.cpp')

diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 26ac5e211..972dad72d 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -19,6 +19,8 @@
 
 #include <boost/filesystem.hpp>
 
+extern std::map<std::string, std::string> mapArgs;
+
 static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request)
 {
     if (request.fHelp) {
-- 
cgit v1.2.3


From c2f61bebb190258753714b29ab2041e80651cec9 Mon Sep 17 00:00:00 2001
From: Matt Corallo <git@bluematt.me>
Date: Sat, 24 Dec 2016 11:28:44 -0500
Subject: Add a ForceSetArg method for testing

---
 src/qt/test/rpcnestedtests.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/qt/test/rpcnestedtests.cpp')

diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
index 972dad72d..fb044489d 100644
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -19,8 +19,6 @@
 
 #include <boost/filesystem.hpp>
 
-extern std::map<std::string, std::string> mapArgs;
-
 static UniValue rpcNestedTest_rpc(const JSONRPCRequest& request)
 {
     if (request.fHelp) {
@@ -47,7 +45,7 @@ void RPCNestedTests::rpcNestedTests()
     std::string path = QDir::tempPath().toStdString() + "/" + strprintf("test_bitcoin_qt_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
     QDir dir(QString::fromStdString(path));
     dir.mkpath(".");
-    mapArgs["-datadir"] = path;
+    ForceSetArg("-datadir", path);
     //mempool.setSanityCheck(1.0);
     pblocktree = new CBlockTreeDB(1 << 20, true);
     pcoinsdbview = new CCoinsViewDB(1 << 23, true);
-- 
cgit v1.2.3