From 94e4add5e880845713d76020c4f90422437c97af Mon Sep 17 00:00:00 2001 From: Andrei Golubev Date: Mon, 26 Apr 2021 14:59:16 +0200 Subject: [PATCH] Skip tst_QUrl::testThreading() under QEMU It usually fails the test with "corrupted size vs. prev_size" message coming from malloc() or some other memory allocation routine (which signals about memory corruption probably) Task-number: QTBUG-93176 Change-Id: I5e34971267c52c63cda2489bef5b09bed739f532 Reviewed-by: Lars Knoll (cherry picked from commit 6d52d86b999088ec07e58c14197bddda043ef0aa) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/corelib/io/qurl/CMakeLists.txt | 1 + tests/auto/corelib/io/qurl/tst_qurl.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/tests/auto/corelib/io/qurl/CMakeLists.txt b/tests/auto/corelib/io/qurl/CMakeLists.txt index ce386c142c6..b5a2ec03312 100644 --- a/tests/auto/corelib/io/qurl/CMakeLists.txt +++ b/tests/auto/corelib/io/qurl/CMakeLists.txt @@ -9,6 +9,7 @@ qt_internal_add_test(tst_qurl tst_qurl.cpp PUBLIC_LIBRARIES Qt::Concurrent + Qt::TestPrivate ) ## Scopes: diff --git a/tests/auto/corelib/io/qurl/tst_qurl.cpp b/tests/auto/corelib/io/qurl/tst_qurl.cpp index 1ee5c9cd420..835dd1e573d 100644 --- a/tests/auto/corelib/io/qurl/tst_qurl.cpp +++ b/tests/auto/corelib/io/qurl/tst_qurl.cpp @@ -38,6 +38,8 @@ #include #include +#include + Q_DECLARE_METATYPE(QUrl::FormattingOptions) class tst_QUrl : public QObject @@ -4124,6 +4126,8 @@ void tst_QUrl::testThreadingHelper() void tst_QUrl::testThreading() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("This test fails in QEMU and looks like because of a data race, QTBUG-93176"); s_urlStorage = new UrlStorage; QThreadPool::globalInstance()->setMaxThreadCount(100); QFutureSynchronizer sync;