diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-06-26 18:29:28 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-06-26 18:29:38 -0400 |
| commit | 3077f11dadffbc8f2575449fc0177c91a9c3e046 (patch) | |
| tree | 69707d332c7b3859b01fea38ea6324a86a721bd1 | |
| parent | 1b28bca04c2767c8bca21d66bd6978f358b0a96a (diff) | |
| parent | f466c4ce846000b2f984b4759f89f3f793fa0100 (diff) | |
| download | bitcoin-3077f11dadffbc8f2575449fc0177c91a9c3e046.tar.xz | |
Merge #16289: test: Add missing ECC_Stop() in GUI rpcnestedtests.cpp
f466c4ce846000b2f984b4759f89f3f793fa0100 Add missing ECC_Stop(); in GUI rpcnestedtests.cpp (Jonas Schnelli)
Pull request description:
Fixes #16288
Was probably missing in #7783
ACKs for top commit:
Sjors:
ACK f466c4c. Tested by comparing `make check` on master and this PR with macOS 10.14.5. I also tried with and without `--enable-debug` / `--without-gui`.
fanquake:
ACK f466c4ce846000b2f984b4759f89f3f793fa0100. Tested running `make check` on macOS.
Tree-SHA512: 648e10c2e35bd01fb92e63709169a6c185ac4b62c69af0109d2cd2d7db47e56ae804c788f9a1a1845746f818764799732f9e58e9dbfca3bffeea8f14683c8c7f
| -rw-r--r-- | src/qt/test/rpcnestedtests.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index 86e5632e2c..1e40bd7209 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -35,7 +35,9 @@ void RPCNestedTests::rpcNestedTests() tableRPC.appendCommand("rpcNestedTest", &vRPCCommands[0]); //mempool.setSanityCheck(1.0); - LogInstance().DisconnectTestLogger(); // Already started by the common test setup, so stop it to avoid interference + ECC_Stop(); // Already started by the common test setup, so stop it to avoid interference + LogInstance().DisconnectTestLogger(); + TestingSetup test; if (RPCIsInWarmup(nullptr)) SetRPCWarmupFinished(); |