Improve reliability of tst_qqmlcomponent::onDestructionLookup auto test on Windows

The test relies on exact garbage collection, which we can't offer anymore.
But we can use the same tricks as in qqmlecmascript to improve the changes
of a successful collect significantly.

Change-Id: I7b3d7eca7a9bdb551a01a5a3da80549196c45f23
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

diff --git a/tests/auto/qml/qqmlcomponent/data/onDestructionLookup.qml b/tests/auto/qml/qqmlcomponent/data/onDestructionLookup.qml
index a62d81c..4ca6b68 100644 (file)
--- a/tests/auto/qml/qqmlcomponent/data/onDestructionLookup.qml
+++ b/tests/auto/qml/qqmlcomponent/data/onDestructionLookup.qml
@@ -25,6 +25,5 @@ Item {
 
     Component.onCompleted: {
         createObject()
-        gc()
     }
 }

diff --git a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
index 9eeff66..408baef 100644 (file)
--- a/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
+++ b/tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp
@@ -96,6 +96,23 @@ public slots:
     }
 };
 
+// The JavaScriptCore GC marks the C stack. To try to ensure that there is
+// no JSObject* left in stack memory by the compiler, we call this function
+// to zap some bytes of memory before calling collectGarbage().
+static void zapSomeStack()
+{
+    char *buf = (char*)alloca(4096);
+    memset(buf, 0, 4096);
+}
+
+static void gc(QQmlEngine &engine)
+{
+    zapSomeStack();
+    engine.collectGarbage();
+    QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
+    QCoreApplication::processEvents();
+}
+
 class tst_qqmlcomponent : public QQmlDataTest
 {
     Q_OBJECT
@@ -377,6 +394,7 @@ void tst_qqmlcomponent::onDestructionLookup()
     QQmlEngine engine;
     QQmlComponent component(&engine, testFileUrl("onDestructionLookup.qml"));
     QScopedPointer<QObject> object(component.create());
+    gc(engine);
     QVERIFY(object != 0);
     QVERIFY(object->property("success").toBool());
 }