From ba8d1da4a971a6351318e86fc613f74843bb2c49 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Thu, 9 Sep 2021 15:34:10 +0200 Subject: 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 Pick-to: 6.1 6.2 Change-Id: I60b7264c6ce44b3b327fdd0dbcede006717c65a6 Reviewed-by: Edward Welbourne --- tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt | 1 + tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'tests/auto/corelib/thread') diff --git a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt index a99001425e..8852a31fa4 100644 --- a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt +++ b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt @@ -9,4 +9,5 @@ qt_internal_add_test(tst_qreadwritelock tst_qreadwritelock.cpp PUBLIC_LIBRARIES Qt::CorePrivate + Qt::TestPrivate ) diff --git a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp index 2f1839b1d9..f1468817ec 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 #include #ifdef Q_OS_UNIX @@ -693,6 +694,9 @@ void tst_QReadWriteLock::multipleReadersBlockRelease() */ void tst_QReadWriteLock::multipleReadersLoop() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Flaky on QEMU, QTBUG-96103"); + constexpr int time = 500; constexpr int hold = 250; constexpr int wait = 0; -- cgit v1.2.3