diff options
author | Toni Saario <toni.saario@qt.io> | 2021-03-03 21:03:25 +0200 |
---|---|---|
committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-03-05 11:02:17 +0000 |
commit | 90371e92502b972c2b1ab18ff7f1f2e6187fce83 (patch) | |
tree | 36c922762501c37ce03e0295914e5a33bd20c48c /tests | |
parent | 852b070529d2721d2d4e1e7ec1c90d8fe536b088 (diff) | |
parent | 49e93b6e3928e12507ec7956d66e79a2555c13a8 (diff) |
Merge "Skip globalstatic threadStressTest on QEMU"
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: |