diff options
author | Russell Yanofsky <russ@yanofsky.org> | 2017-03-10 15:52:29 -0500 |
---|---|---|
committer | Russell Yanofsky <russ@yanofsky.org> | 2017-03-10 15:52:29 -0500 |
commit | cc9503cec9c66acfb38d56b094ada8382d15434f (patch) | |
tree | 6339bd010b3f881bedac2e8ce56304ffcd2a8e10 | |
parent | 91e303595be2cc2361a5e32000e23a3b744e2fc1 (diff) | |
download | bitcoin-cc9503cec9c66acfb38d56b094ada8382d15434f.tar.xz |
Make qt test compatible with TestChain100Setup framework
Reset global state after rpc tests, and remove unnecessary ECC initialization
to prevent assert error if it is initialized twice.
-rw-r--r-- | src/qt/test/rpcnestedtests.cpp | 4 | ||||
-rw-r--r-- | src/qt/test/test_main.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index bd496f149c..a7b82117d8 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -148,9 +148,13 @@ void RPCNestedTests::rpcNestedTests() QVERIFY_EXCEPTION_THROWN(RPCConsole::RPCExecuteCommandLine(result, "rpcNestedTest(abc,,)"), std::runtime_error); //don't tollerate empty arguments when using , #endif + UnloadBlockIndex(); delete pcoinsTip; + pcoinsTip = nullptr; delete pcoinsdbview; + pcoinsdbview = nullptr; delete pblocktree; + pblocktree = nullptr; boost::filesystem::remove_all(boost::filesystem::path(path)); } diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index d44d711315..fd07ecb7ae 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -7,7 +7,6 @@ #endif #include "chainparams.h" -#include "key.h" #include "rpcnestedtests.h" #include "util.h" #include "uritests.h" @@ -36,7 +35,6 @@ extern void noui_connect(); // This is all you need to run all the tests int main(int argc, char *argv[]) { - ECC_Start(); SetupEnvironment(); SetupNetworking(); SelectParams(CBaseChainParams::MAIN); @@ -66,6 +64,5 @@ int main(int argc, char *argv[]) if (QTest::qExec(&test4) != 0) fInvalid = true; - ECC_Stop(); return fInvalid; } |