From 49e93b6e3928e12507ec7956d66e79a2555c13a8 Mon Sep 17 00:00:00 2001
From: Toni Saario <toni.saario@qt.io>
Date: Wed, 3 Mar 2021 21:03:25 +0200
Subject: 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>
---
 tests/auto/corelib/global/qglobalstatic/CMakeLists.txt        | 1 +
 tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp | 5 +++++
 2 files changed, 6 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
index 959b2b25b0..6f8a784a0d 100644
--- a/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
+++ b/tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
@@ -12,4 +12,5 @@ qt_internal_add_test(tst_qglobalstatic
         SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
     PUBLIC_LIBRARIES
         Qt::CorePrivate
+        Qt::TestPrivate
 )
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:
-- 
cgit v1.2.3