File tree Expand file tree Collapse file tree 2 files changed +5
-11
lines changed Expand file tree Collapse file tree 2 files changed +5
-11
lines changed Original file line number Diff line number Diff line change 5
5
#include < qt/test/apptests.h>
6
6
7
7
#include < chainparams.h>
8
+ #include < key.h>
8
9
#include < qt/bitcoin.h>
9
10
#include < qt/bitcoingui.h>
10
11
#include < qt/networkstyle.h>
@@ -62,6 +63,7 @@ void AppTests::appTests()
62
63
}
63
64
#endif
64
65
66
+ ECC_Stop (); // Already started by the common test setup, so stop it to avoid interference
65
67
m_app.parameterSetup ();
66
68
m_app.createOptionsModel (true /* reset settings */ );
67
69
QScopedPointer<const NetworkStyle> style (
Original file line number Diff line number Diff line change 11
11
#include < qt/bitcoin.h>
12
12
#include < qt/test/apptests.h>
13
13
#include < qt/test/rpcnestedtests.h>
14
- #include < util/system.h>
15
14
#include < qt/test/uritests.h>
16
15
#include < qt/test/compattests.h>
16
+ #include < test/setup_common.h>
17
17
18
18
#ifdef ENABLE_WALLET
19
19
#include < qt/test/addressbooktests.h>
@@ -48,14 +48,8 @@ extern void noui_connect();
48
48
// This is all you need to run all the tests
49
49
int main (int argc, char *argv[])
50
50
{
51
- SetupEnvironment ();
52
- SetupNetworking ();
53
- SelectParams (CBaseChainParams::REGTEST);
54
- noui_connect ();
55
- ClearDatadirCache ();
56
- fs::path pathTemp = fs::temp_directory_path () / strprintf (" test_bitcoin-qt_%lu_%i" , (unsigned long )GetTime (), (int )GetRand (100000 ));
57
- fs::create_directories (pathTemp);
58
- gArgs .ForceSetArg (" -datadir" , pathTemp.string ());
51
+ BasicTestingSetup test{CBaseChainParams::REGTEST};
52
+
59
53
auto node = interfaces::MakeNode ();
60
54
61
55
bool fInvalid = false ;
@@ -109,7 +103,5 @@ int main(int argc, char *argv[])
109
103
}
110
104
#endif
111
105
112
- fs::remove_all (pathTemp);
113
-
114
106
return fInvalid ;
115
107
}
You can’t perform that action at this time.
0 commit comments