diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/global/qglobalstatic/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp | 5 |
2 files changed, 6 insertions, 0 deletions
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: |