From b9be95b070dc1580649aac94d48ff3ef8e391fbc Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Thu, 9 Sep 2021 15:34:10 +0200 Subject: [PATCH] Skip tst_QReadWriteLock::multipleReadersLoop on QEMU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit ba8d1da4a971a6351318e86fc613f74843bb2c49) Reviewed-by: MÃ¥rten Nordheim --- tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt | 2 ++ .../auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt index 4b81229024b..6b30794aef1 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 ca282e2723d..af5fe4a203b 100644 --- a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp +++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #ifdef Q_OS_UNIX #include @@ -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;