sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #17015: qa: Explain QT_QPA_PLATFORM for gui tests

Browse Source 
fa06bb607da2d3e35723661156d873c8eac1fa50 qa: Do not force overwrite of QT_QPA_PLATFORM on windows for gui tests (MarcoFalke)
faccf5f9c899c40d4da5792629d0714249a4616b doc: Explain QT_QPA_PLATFORM for gui tests (MarcoFalke)

Pull request description:

  Closes #17013

ACKs for top commit:
  promag:
    ACK fa06bb607da2d3e35723661156d873c8eac1fa50.
  jonasschnelli:
    ACK fa06bb60
  ryanofsky:
    utACK fa06bb607da2d3e35723661156d873c8eac1fa50
  fanquake:
    ACK fa06bb607da2d3e35723661156d873c8eac1fa50 - tested on macOS using `QT_QPA_PLATFORM=cocoa src/qt/test/test_bitcoin-qt`.

Tree-SHA512: f257159f6e66b2df7e870ac832ae9ef09eea173c8b7cd766458f87cf22f94681c81dcc54dea030dbc97eab5e3ae5132a4ffe8a343431a4e40f7ee29dc808dcb1
This commit is contained in:
fanquake 2019-10-02 07:30:28 +08:00 committed by humbleDasher
parent 40c259bdf3
commit dd37d5f947
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/test/addressbooktests.cpp
View File

@ -145,7 +145,7 @@ void AddressBookTests::addressBookTests()
// and fails to handle returned nulls // and fails to handle returned nulls
// (https://bugreports.qt.io/browse/QTBUG-49686). // (https://bugreports.qt.io/browse/QTBUG-49686).
QWARN("Skipping AddressBookTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke " QWARN("Skipping AddressBookTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke "
"with 'test_dash-qt -platform cocoa' on mac, or else use a linux or windows build."); "with 'QT_QPA_PLATFORM=cocoa test_dash-qt' on mac, or else use a linux or windows build.");
return; return;
} }
#endif #endif

2
src/qt/test/apptests.cpp
View File

@ -62,7 +62,7 @@ void AppTests::appTests()
// and fails to handle returned nulls // and fails to handle returned nulls
// (https://bugreports.qt.io/browse/QTBUG-49686). // (https://bugreports.qt.io/browse/QTBUG-49686).
QWARN("Skipping AppTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke " QWARN("Skipping AppTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke "
"with 'test_dash-qt -platform cocoa' on mac, or else use a linux or windows build."); "with 'QT_QPA_PLATFORM=cocoa test_dash-qt' on mac, or else use a linux or windows build.");
return; return;
} }
#endif #endif

4
src/qt/test/test_main.cpp
View File

@ -59,9 +59,9 @@ int main(int argc, char *argv[])
// platform ("xcb", "windows", or "cocoa") so tests can't unintentionally // platform ("xcb", "windows", or "cocoa") so tests can't unintentionally
// interfere with any background GUIs and don't require extra resources. // interfere with any background GUIs and don't require extra resources.
#if defined(WIN32) #if defined(WIN32)
_putenv_s("QT_QPA_PLATFORM", "minimal"); if (getenv("QT_QPA_PLATFORM") == nullptr) _putenv_s("QT_QPA_PLATFORM", "minimal");
#else #else
setenv("QT_QPA_PLATFORM", "minimal", 0); setenv("QT_QPA_PLATFORM", "minimal", /* overwrite */ 0);
#endif #endif
// Don't remove this, it's needed to access // Don't remove this, it's needed to access

8
src/qt/test/wallettests.cpp
View File

@ -96,9 +96,9 @@ QModelIndex FindTx(const QAbstractItemModel& model, const uint256& txid)
// //
// This also requires overriding the default minimal Qt platform: // This also requires overriding the default minimal Qt platform:
// //
// src/qt/test/test_dash-qt -platform xcb # Linux // QT_QPA_PLATFORM=xcb src/qt/test/test_dash-qt # Linux
// src/qt/test/test_dash-qt -platform windows # Windows // QT_QPA_PLATFORM=windows src/qt/test/test_dash-qt # Windows
// src/qt/test/test_dash-qt -platform cocoa # macOS // QT_QPA_PLATFORM=cocoa src/qt/test/test_dash-qt # macOS
void TestGUI() void TestGUI()
{ {
// Set up wallet and chain with 105 blocks (5 mature blocks for spending). // Set up wallet and chain with 105 blocks (5 mature blocks for spending).
@ -224,7 +224,7 @@ void WalletTests::walletTests()
// and fails to handle returned nulls // and fails to handle returned nulls
// (https://bugreports.qt.io/browse/QTBUG-49686). // (https://bugreports.qt.io/browse/QTBUG-49686).
QWARN("Skipping WalletTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke " QWARN("Skipping WalletTests on mac build with 'minimal' platform set due to Qt bugs. To run AppTests, invoke "
"with 'test_dash-qt -platform cocoa' on mac, or else use a linux or windows build."); "with 'QT_QPA_PLATFORM=cocoa test_dash-qt' on mac, or else use a linux or windows build.");
return; return;
} }
#endif #endif