summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2021-09-09 15:34:10 +0200
committerSona Kurazyan <sona.kurazyan@qt.io>2021-09-10 09:53:51 +0200
commitb9be95b070dc1580649aac94d48ff3ef8e391fbc (patch)
treeecb47aa6c5e5cee9a60d7a91975f7032e5f4991f
parent99dfbca5c44705862314845535447d95bbf047cf (diff)
Skip tst_QReadWriteLock::multipleReadersLoop on QEMU
The test is randomly failing in the CI on QEMU. Couldn't reproduce it on the actual armv7 hardware, so most likely it's not a Qt bug. Fixes: QTBUG-96103 Change-Id: I60b7264c6ce44b3b327fdd0dbcede006717c65a6 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> (cherry picked from commit ba8d1da4a971a6351318e86fc613f74843bb2c49) Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
-rw-r--r--tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt2
-rw-r--r--tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp4
2 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
index 4b81229024..6b30794aef 100644
--- a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
@@ -7,4 +7,6 @@
qt_internal_add_test(tst_qreadwritelock
SOURCES
tst_qreadwritelock.cpp
+ PUBLIC_LIBRARIES
+ Qt::TestPrivate
)
diff --git a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
index ca282e2723..af5fe4a203 100644
--- a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
@@ -34,6 +34,7 @@
#include <qmutex.h>
#include <qthread.h>
#include <qwaitcondition.h>
+#include <private/qemulationdetector_p.h>
#ifdef Q_OS_UNIX
#include <unistd.h>
@@ -696,6 +697,9 @@ void tst_QReadWriteLock::multipleReadersBlockRelease()
*/
void tst_QReadWriteLock::multipleReadersLoop()
{
+ if (QTestPrivate::isRunningArmOnX86())
+ QSKIP("Flaky on QEMU, QTBUG-96103");
+
int time=500;
int hold=250;
int wait=0;