1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Skip globalstatic threadStressTest on QEMU

Browse Source 
The test causes frequent failures in the CI. This is the most
subtle fix until it is properly fixed.

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>
(cherry picked from commit 49e93b6e3928e12507ec7956d66e79a2555c13a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Toni Saario 2021-03-03 21:03:25 +02:00 committed by Qt Cherry-pick Bot
parent 03332d8a00
commit 9c0ba50658
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/auto/corelib/global/qglobalstatic/CMakeLists.txt
View File

@ -12,4 +12,5 @@ qt_internal_add_test(tst_qglobalstatic
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
PUBLIC_LIBRARIES
Qt::CorePrivate
Qt::TestPrivate
)

5
tests/auto/corelib/global/qglobalstatic/tst_qglobalstatic.cpp
View File

@ -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: