diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2019-08-06 08:49:31 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2019-08-06 08:49:34 -0400 |
| commit | e5fdda68c6d2313edb74443f0d1e6d2ce2d97f5e (patch) | |
| tree | 3491c919b04a20c0dba5e99566704352edeed8ee | |
| parent | b725979a1175b6284c5226b2ab5effec5b3f911a (diff) | |
| parent | 2f37163caf244acbe5fc715f2321aebc231522bc (diff) | |
Merge #16554: test: only include and use OpenSSL where it's actually needed (BIP70)
2f37163caf244acbe5fc715f2321aebc231522bc test: only include and init openSSL where it's actually used (fanquake)
Pull request description:
This should save initializing OpenSSL during tests if compiled with `--disable-bip70`.
ACKs for top commit:
laanwj:
straightforward ACK 2f37163caf244acbe5fc715f2321aebc231522bc
Tree-SHA512: 513e867718c79b014b4d470404c891d83c21df92eed07abaccd89b88a32f8b801e402e7d0d400c49c1b964f4b76409ca17fb90bde2e2c45dcf8a1897b452683f
| -rw-r--r-- | src/qt/test/paymentservertests.cpp | 2 | ||||
| -rw-r--r-- | src/qt/test/test_main.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index 6cafe05461..eca468a6ab 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -16,6 +16,7 @@ #include <test/setup_common.h> #include <util/strencodings.h> +#include <openssl/ssl.h> #include <openssl/x509.h> #include <openssl/x509_vfy.h> @@ -66,6 +67,7 @@ static SendCoinsRecipient handleRequest(PaymentServer* server, std::vector<unsig void PaymentServerTests::paymentServerTests() { + SSL_library_init(); BasicTestingSetup testing_setup(CBaseChainParams::MAIN); auto node = interfaces::MakeNode(); OptionsModel optionsModel(*node); diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index 6bda8dc6eb..dd5216d68c 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -26,8 +26,6 @@ #include <QObject> #include <QTest> -#include <openssl/ssl.h> - #if defined(QT_STATICPLUGIN) #include <QtPlugin> #if defined(QT_QPA_PLATFORM_MINIMAL) @@ -73,8 +71,6 @@ int main(int argc, char *argv[]) BitcoinApplication app(*node, argc, argv); app.setApplicationName("Bitcoin-Qt-test"); - SSL_library_init(); - AppTests app_tests(app); if (QTest::qExec(&app_tests) != 0) { fInvalid = true; |