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>bb10
parent
5c6b10c3ce
commit
49e93b6e39
|
|
@ -12,4 +12,5 @@ qt_internal_add_test(tst_qglobalstatic
|
|||
SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
|
||||
PUBLIC_LIBRARIES
|
||||
Qt::CorePrivate
|
||||
Qt::TestPrivate
|
||||
)
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
Loading…
Reference in New Issue