mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-09-12 05:32:22 +02:00
qt, test: Enable tests on macOS with minimal QPA plugin
The crash source, implicit `NSApplication` instantiation with a non-Cocoa QPA plugin, was fixed in the previous commit.
This commit is contained in:
@@ -212,16 +212,5 @@ void TestAddAddressesToSendBook(interfaces::Node& node)
|
||||
|
||||
void AddressBookTests::addressBookTests()
|
||||
{
|
||||
#ifdef Q_OS_MACOS
|
||||
if (QApplication::platformName() == "minimal") {
|
||||
// Disable for mac on "minimal" platform to avoid crashes inside the Qt
|
||||
// framework when it tries to look up unimplemented cocoa functions,
|
||||
// and fails to handle returned nulls
|
||||
// (https://bugreports.qt.io/browse/QTBUG-49686).
|
||||
qWarning() << "Skipping AddressBookTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke "
|
||||
"with 'QT_QPA_PLATFORM=cocoa test_bitcoin-qt' on mac, or else use a linux or windows build.";
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
TestAddAddressesToSendBook(m_node);
|
||||
}
|
||||
|
||||
@@ -54,18 +54,6 @@ void TestRpcCommand(RPCConsole* console)
|
||||
//! Entry point for BitcoinApplication tests.
|
||||
void AppTests::appTests()
|
||||
{
|
||||
#ifdef Q_OS_MACOS
|
||||
if (QApplication::platformName() == "minimal") {
|
||||
// Disable for mac on "minimal" platform to avoid crashes inside the Qt
|
||||
// framework when it tries to look up unimplemented cocoa functions,
|
||||
// and fails to handle returned nulls
|
||||
// (https://bugreports.qt.io/browse/QTBUG-49686).
|
||||
qWarning() << "Skipping AppTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke "
|
||||
"with 'QT_QPA_PLATFORM=cocoa test_bitcoin-qt' on mac, or else use a linux or windows build.";
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
qRegisterMetaType<interfaces::BlockAndHeaderTipInfo>("interfaces::BlockAndHeaderTipInfo");
|
||||
m_app.parameterSetup();
|
||||
QVERIFY(m_app.createOptionsModel(/*resetSettings=*/true));
|
||||
|
||||
@@ -455,16 +455,5 @@ void TestGUI(interfaces::Node& node)
|
||||
|
||||
void WalletTests::walletTests()
|
||||
{
|
||||
#ifdef Q_OS_MACOS
|
||||
if (QApplication::platformName() == "minimal") {
|
||||
// Disable for mac on "minimal" platform to avoid crashes inside the Qt
|
||||
// framework when it tries to look up unimplemented cocoa functions,
|
||||
// and fails to handle returned nulls
|
||||
// (https://bugreports.qt.io/browse/QTBUG-49686).
|
||||
qWarning() << "Skipping WalletTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke "
|
||||
"with 'QT_QPA_PLATFORM=cocoa test_bitcoin-qt' on mac, or else use a linux or windows build.";
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
TestGUI(m_node);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user