aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-10-01 16:11:12 -0400
committerMarcoFalke <falke.marco@gmail.com>2019-10-01 16:06:23 -0400
commitfaccf5f9c899c40d4da5792629d0714249a4616b (patch)
tree278529db9ea82f174c442e011b2ffb56e5d14786
parent6e4f6553913978fcdddba30e0bb6f97edcb12e80 (diff)
downloadbitcoin-faccf5f9c899c40d4da5792629d0714249a4616b.tar.xz
doc: Explain QT_QPA_PLATFORM for gui tests
-rw-r--r--src/qt/test/addressbooktests.cpp2
-rw-r--r--src/qt/test/apptests.cpp2
-rw-r--r--src/qt/test/test_main.cpp2
-rw-r--r--src/qt/test/wallettests.cpp8
4 files changed, 7 insertions, 7 deletions
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp
index 11a518ebd2..4fe440a679 100644
--- a/src/qt/test/addressbooktests.cpp
+++ b/src/qt/test/addressbooktests.cpp
@@ -146,7 +146,7 @@ void AddressBookTests::addressBookTests()
// and fails to handle returned nulls
// (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 "
- "with 'test_bitcoin-qt -platform cocoa' on mac, or else use a linux or windows build.");
+ "with 'QT_QPA_PLATFORM=cocoa test_bitcoin-qt' on mac, or else use a linux or windows build.");
return;
}
#endif
diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp
index 8ae01ac093..e730c8f6d5 100644
--- a/src/qt/test/apptests.cpp
+++ b/src/qt/test/apptests.cpp
@@ -57,7 +57,7 @@ void AppTests::appTests()
// and fails to handle returned nulls
// (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 "
- "with 'test_bitcoin-qt -platform cocoa' on mac, or else use a linux or windows build.");
+ "with 'QT_QPA_PLATFORM=cocoa test_bitcoin-qt' on mac, or else use a linux or windows build.");
return;
}
#endif
diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp
index 796cf24b36..3e6b3a2a12 100644
--- a/src/qt/test/test_main.cpp
+++ b/src/qt/test/test_main.cpp
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
#if defined(WIN32)
_putenv_s("QT_QPA_PLATFORM", "minimal");
#else
- setenv("QT_QPA_PLATFORM", "minimal", 0);
+ setenv("QT_QPA_PLATFORM", "minimal", /* overwrite */ 0);
#endif
// Don't remove this, it's needed to access
diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp
index 120dff95c0..eea874c0d4 100644
--- a/src/qt/test/wallettests.cpp
+++ b/src/qt/test/wallettests.cpp
@@ -123,9 +123,9 @@ void BumpFee(TransactionView& view, const uint256& txid, bool expectDisabled, st
//
// This also requires overriding the default minimal Qt platform:
//
-// src/qt/test/test_bitcoin-qt -platform xcb # Linux
-// src/qt/test/test_bitcoin-qt -platform windows # Windows
-// src/qt/test/test_bitcoin-qt -platform cocoa # macOS
+// QT_QPA_PLATFORM=xcb src/qt/test/test_bitcoin-qt # Linux
+// QT_QPA_PLATFORM=windows src/qt/test/test_bitcoin-qt # Windows
+// QT_QPA_PLATFORM=cocoa src/qt/test/test_bitcoin-qt # macOS
void TestGUI()
{
// Set up wallet and chain with 105 blocks (5 mature blocks for spending).
@@ -256,7 +256,7 @@ void WalletTests::walletTests()
// and fails to handle returned nulls
// (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 "
- "with 'test_bitcoin-qt -platform cocoa' on mac, or else use a linux or windows build.");
+ "with 'QT_QPA_PLATFORM=cocoa test_bitcoin-qt' on mac, or else use a linux or windows build.");
return;
}
#endif