summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
diff options
context:
space:
mode:
authorToni Saario <toni.saario@qt.io>2021-03-03 21:03:25 +0200
committerToni Saario <toni.saario@qt.io>2021-03-05 08:09:59 +0000
commit49e93b6e3928e12507ec7956d66e79a2555c13a8 (patch)
treebc7948cc2567158d3b812d4ab50641b042db57cf /tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
parent5c6b10c3cee5737dbc041d0463220898c8120807 (diff)
Skip globalstatic threadStressTest on QEMU
The test causes frequent failures in the CI. This is the most subtle fix until it is properly fixed. Pick-to: 6.1 Task-number: QTBUG-91423 Change-Id: I6499378dcd3ed1c31275db38d83b572e764366cc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp')
-rw-r--r--tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
index dfc62ce163..190df2a555 100644
--- a/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
+++ b/tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
@@ -35,6 +35,8 @@
#include <sys/resource.h>
#endif
+#include <QtTest/private/qemulationdetector_p.h>
+
class tst_QGlobalStatic : public QObject
{
Q_OBJECT
@@ -179,6 +181,9 @@ Q_GLOBAL_STATIC_WITH_ARGS(ThrowingType, threadStressTestGS, (threadStressTestCon
void tst_QGlobalStatic::threadStressTest()
{
+ if (QTestPrivate::isRunningArmOnX86())
+ QSKIP("Frequently hangs on QEMU, QTBUG-91423");
+
class ThreadStressTestThread: public QThread
{
public: