test: only include and init openSSL where it's actually used

This commit is contained in:
fanquake 2019-08-06 16:50:42 +08:00
parent fbe4b7665b
commit 2f37163caf
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
2 changed files with 2 additions and 4 deletions

View file

@ -16,6 +16,7 @@
#include <test/setup_common.h> #include <test/setup_common.h>
#include <util/strencodings.h> #include <util/strencodings.h>
#include <openssl/ssl.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/x509_vfy.h> #include <openssl/x509_vfy.h>
@ -66,6 +67,7 @@ static SendCoinsRecipient handleRequest(PaymentServer* server, std::vector<unsig
void PaymentServerTests::paymentServerTests() void PaymentServerTests::paymentServerTests()
{ {
SSL_library_init();
BasicTestingSetup testing_setup(CBaseChainParams::MAIN); BasicTestingSetup testing_setup(CBaseChainParams::MAIN);
auto node = interfaces::MakeNode(); auto node = interfaces::MakeNode();
OptionsModel optionsModel(*node); OptionsModel optionsModel(*node);

View file

@ -26,8 +26,6 @@
#include <QObject> #include <QObject>
#include <QTest> #include <QTest>
#include <openssl/ssl.h>
#if defined(QT_STATICPLUGIN) #if defined(QT_STATICPLUGIN)
#include <QtPlugin> #include <QtPlugin>
#if defined(QT_QPA_PLATFORM_MINIMAL) #if defined(QT_QPA_PLATFORM_MINIMAL)
@ -73,8 +71,6 @@ int main(int argc, char *argv[])
BitcoinApplication app(*node, argc, argv); BitcoinApplication app(*node, argc, argv);
app.setApplicationName("Bitcoin-Qt-test"); app.setApplicationName("Bitcoin-Qt-test");
SSL_library_init();
AppTests app_tests(app); AppTests app_tests(app);
if (QTest::qExec(&app_tests) != 0) { if (QTest::qExec(&app_tests) != 0) {
fInvalid = true; fInvalid = true;