diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2013-08-05 16:06:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-05 21:20:11 +0200 |
commit | 78fc74eac4ca971f386a2946e8b32d5193946277 (patch) | |
tree | 8a5e41d9b5dc8271241699583ab2e7c65be9b8d8 | |
parent | 093f31330acf40a70681b0ff825987d6506f3f5e (diff) |
Disable some GC sensitive tests with MSVC
We can't get these tests to work reliably with MSVC because it depends on
how MSVC optimizes away memory stores that are "dead" stores for the compiler
but not for our conservative collector.
Change-Id: Ia5ca197573a09358c220d926deccaaf0bacc3a0b
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
-rw-r--r-- | tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index fd563f6304..3574b58ba4 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -4880,6 +4880,9 @@ void tst_qqmlecmascript::propertyVarCircular2() QCOMPARE(childObject->property("textCanary").toInt(), 10); QMetaObject::invokeMethod(object, "deassignCircular"); gc(engine); +#if defined(Q_CC_MSVC) + QSKIP("This test does not work reliably with MSVC."); +#endif QVERIFY(rootObjectTracker.isNull()); // should have been collected QVERIFY(childObjectTracker.isNull()); // should have been collected delete object; @@ -4931,6 +4934,9 @@ void tst_qqmlecmascript::propertyVarInheritance() // ensure that there are only weak handles to the underlying varProperties array remaining. gc(engine); // an equivalent for pragma GCC optimize is still work-in-progress for CLang, so this test will fail. +#if defined(Q_CC_MSVC) + QSKIP("This test does not work reliably with MSVC."); +#endif #if !defined(Q_CC_CLANG) QVERIFY(icoCanaryHandle.isEmpty()); QVERIFY(ccoCanaryHandle.isEmpty()); @@ -4970,6 +4976,9 @@ void tst_qqmlecmascript::propertyVarInheritance2() QMetaObject::invokeMethod(object, "deassignCircular"); gc(engine); // an equivalent for pragma GCC optimize is still work-in-progress for CLang, so this test will fail. +#if defined(Q_CC_MSVC) + QSKIP("This test does not work reliably with MSVC."); +#endif #if !defined(Q_CC_CLANG) QVERIFY(childObjectVarArrayValueHandle.isEmpty()); // should have been collected now. #endif |