From 493d08aeeac4fc808cb4e5daef6368b396ff99ca Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Sat, 12 Sep 2015 18:28:16 +0200 Subject: [PATCH] Fix tst_qthreadstorage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This test when running on Windows has a race condition since in qthread_win.cpp the finished signal is emitted before everything is cleaned up. Change-Id: I3c03d9a245e297e8f79b2be2c34398bf7bac9bae Reviewed-by: Jędrzej Nowacki --- tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp index 5e9b7370b9..ed7b446172 100644 --- a/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp +++ b/tests/auto/corelib/thread/qthreadstorage/tst_qthreadstorage.cpp @@ -240,7 +240,7 @@ void tst_QThreadStorage::adoptedThreads() QTestEventLoop::instance().enterLoop(2); QVERIFY(!QTestEventLoop::instance().timeout()); - QCOMPARE(Pointer::count, c); + QTRY_COMPARE(Pointer::count, c); } QBasicAtomicInt cleanupOrder = Q_BASIC_ATOMIC_INITIALIZER(0);