From d8d3259b2340baed2e7f8273907bd0bb5598b540 Mon Sep 17 00:00:00 2001
From: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Date: Wed, 30 Aug 2017 15:39:28 +0300
Subject: Enable tests for boot2qt

Some tests needed fixing
- Disabled tests too heavy for qemu
- Skipped tests requiring OpenGL without support from the platform
- Skipped tests requiring functionality on broken offscreen platform
- Skipped tests that take too long on qemu + software renderer
- Blacklisted tests for created bugs QTBUG-63049, QTBUG-63053
  QTBUG-63055 and QTBUG-63057

Task-number: QTBUG-60268
Change-Id: I0346b0e436cf286d7d9cbc140acf324a4087cfb9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 .../qqmlprofilerservice/tst_qqmlprofilerservice.cpp   | 19 ++++++++++++-------
 tests/auto/qml/qml.pro                                | 10 ++++------
 tests/auto/qml/qmlmin/qmlmin.pro                      |  6 ++++--
 tests/auto/qml/qqmlengine/qqmlengine.pro              |  5 +++++
 tests/auto/qml/qqmlengine/tst_qqmlengine.cpp          |  4 ++++
 5 files changed, 29 insertions(+), 15 deletions(-)

(limited to 'tests/auto/qml')

diff --git a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
index 6232a8a867..cc6083cb98 100644
--- a/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
+++ b/tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
@@ -36,6 +36,9 @@
 #include <QtTest/qtest.h>
 #include <QtCore/qlibraryinfo.h>
 
+#include <QtGui/private/qguiapplication_p.h>
+#include <QtGui/qpa/qplatformintegration.h>
+
 struct QQmlProfilerData
 {
     QQmlProfilerData(qint64 time = -2, int messageType = -1, int detailType = -1,
@@ -584,16 +587,18 @@ void tst_QQmlProfilerService::scenegraphData()
     qint64 contextFrameTime = -1;
     qint64 renderFrameTime = -1;
 #if QT_CONFIG(opengl) //Software renderer doesn't have context frames
-    foreach (const QQmlProfilerData &msg, m_client->asynchronousMessages) {
-        if (msg.messageType == QQmlProfilerDefinitions::SceneGraphFrame) {
-            if (msg.detailType == QQmlProfilerDefinitions::SceneGraphContextFrame) {
-                contextFrameTime = msg.time;
-                break;
+    if (QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)) {
+        foreach (const QQmlProfilerData &msg, m_client->asynchronousMessages) {
+            if (msg.messageType == QQmlProfilerDefinitions::SceneGraphFrame) {
+                if (msg.detailType == QQmlProfilerDefinitions::SceneGraphContextFrame) {
+                    contextFrameTime = msg.time;
+                    break;
+                }
             }
         }
-    }
 
-    QVERIFY(contextFrameTime != -1);
+        QVERIFY(contextFrameTime != -1);
+    }
 #endif
     foreach (const QQmlProfilerData &msg, m_client->asynchronousMessages) {
         if (msg.detailType == QQmlProfilerDefinitions::SceneGraphRendererFrame) {
diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro
index 69af3cd13b..9155f5b021 100644
--- a/tests/auto/qml/qml.pro
+++ b/tests/auto/qml/qml.pro
@@ -9,7 +9,6 @@ PUBLICTESTS += \
     qjsonbinding \
     qqmlfile \
 
-!boot2qt {
 PUBLICTESTS += \
     qmlmin \
     qqmlcomponent \
@@ -31,7 +30,6 @@ PUBLICTESTS += \
     qqmlsettings \
     qqmlstatemachine \
     qmldiskcache
-}
 
 PRIVATETESTS += \
     qqmlcpputils \
@@ -39,7 +37,6 @@ PRIVATETESTS += \
     v4misc \
     qmlcachegen
 
-!boot2qt {
 PRIVATETESTS += \
     animation \
     qqmlecmascript \
@@ -74,7 +71,6 @@ PRIVATETESTS += \
     qv4mm \
     ecmascripttests \
     bindingdependencyapi
-}
 
 qtHaveModule(widgets) {
     PUBLICTESTS += \
@@ -84,9 +80,11 @@ qtHaveModule(widgets) {
 
 SUBDIRS += $$PUBLICTESTS
 SUBDIRS += $$METATYPETESTS
-qtConfig(process):!boot2qt {
+qtConfig(process) {
     !contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger
-    SUBDIRS += qmllint qmlplugindump
+    !boot2qt {
+        SUBDIRS += qmllint qmlplugindump
+    }
 }
 
 qtConfig(library) {
diff --git a/tests/auto/qml/qmlmin/qmlmin.pro b/tests/auto/qml/qmlmin/qmlmin.pro
index 6af6653270..93e5caabcf 100644
--- a/tests/auto/qml/qmlmin/qmlmin.pro
+++ b/tests/auto/qml/qmlmin/qmlmin.pro
@@ -6,5 +6,7 @@ macx:CONFIG -= app_bundle
 SOURCES += tst_qmlmin.cpp
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
-
-cross_compile: DEFINES += QTEST_CROSS_COMPILED
+# Boot2qt is cross compiled but it has sources available
+!boot2qt {
+   cross_compile: DEFINES += QTEST_CROSS_COMPILED
+}
diff --git a/tests/auto/qml/qqmlengine/qqmlengine.pro b/tests/auto/qml/qqmlengine/qqmlengine.pro
index e7952d8e3a..8d1e149d62 100644
--- a/tests/auto/qml/qqmlengine/qqmlengine.pro
+++ b/tests/auto/qml/qqmlengine/qqmlengine.pro
@@ -7,3 +7,8 @@ include (../../shared/util.pri)
 SOURCES += tst_qqmlengine.cpp
 
 QT += core-private gui-private qml-private  network testlib
+
+boot2qt: {
+    # GC corruption test is too heavy for qemu-arm
+    DEFINES += SKIP_GCCORRUPTION_TEST
+}
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
index 7aca830297..b332ab2194 100644
--- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
+++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp
@@ -862,6 +862,10 @@ void tst_qqmlengine::qmlContextProperties()
 
 void tst_qqmlengine::testGCCorruption()
 {
+#ifdef SKIP_GCCORRUPTION_TEST
+    QSKIP("Test too heavy for qemu");
+#endif
+
     QQmlEngine e;
 
     QQmlComponent c(&e, testFileUrl("testGCCorruption.qml"));
-- 
cgit v1.2.3