From 67166fd9a8bfda0bea09196f793a7fc2ac35c505 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Date: Fri, 19 Feb 2016 15:10:04 +0100
Subject: Enable qquickwebengineviewgraphics test in CI

This test requires the QtQuick test support API. Exclude it from build
if the API isn't available. Blacklist one problematic test case.
Remove the - now superfluous - ENABLE_QML_TESTSUPPORT_API checks.

Change-Id: I0b36de182628969e1185d685fa098d6140ae8d9c
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 tests/auto/quick/qquickwebengineviewgraphics/BLACKLIST              | 2 ++
 .../qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro     | 1 -
 .../qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp | 6 ------
 3 files changed, 2 insertions(+), 7 deletions(-)
 create mode 100644 tests/auto/quick/qquickwebengineviewgraphics/BLACKLIST

(limited to 'tests/auto/quick/qquickwebengineviewgraphics')

diff --git a/tests/auto/quick/qquickwebengineviewgraphics/BLACKLIST b/tests/auto/quick/qquickwebengineviewgraphics/BLACKLIST
new file mode 100644
index 000000000..d0b244ef4
--- /dev/null
+++ b/tests/auto/quick/qquickwebengineviewgraphics/BLACKLIST
@@ -0,0 +1,2 @@
+[showHideShow]
+osx windows
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro
index 9471def00..cbd11cdca 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro
+++ b/tests/auto/quick/qquickwebengineviewgraphics/qquickwebengineviewgraphics.pro
@@ -1,4 +1,3 @@
 include(../tests.pri)
-CONFIG -= testcase      # remove, once this passes in the CI
 exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
 QT_PRIVATE += webengine-private
diff --git a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
index bb09f890e..5661879d5 100644
--- a/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
+++ b/tests/auto/quick/qquickwebengineviewgraphics/tst_qquickwebengineviewgraphics.cpp
@@ -92,9 +92,7 @@ private Q_SLOTS:
 private:
     void setHtml(const QString &html);
     QScopedPointer<TestView> m_view;
-#ifdef ENABLE_QML_TESTSUPPORT_API
     QScopedPointer<QQuickWebEngineTestSupport> m_testSupport;
-#endif
 };
 
 static const QString greenSquare("<div style=\"background-color: #00ff00; position:absolute; left:50px; top: 50px; width: 50px; height: 50px;\"></div>");
@@ -125,9 +123,7 @@ tst_QQuickWebEngineViewGraphics::~tst_QQuickWebEngineViewGraphics()
 void tst_QQuickWebEngineViewGraphics::initTestCase()
 {
     QtWebEngine::initialize();
-#ifdef ENABLE_QML_TESTSUPPORT_API
     m_testSupport.reset(new QQuickWebEngineTestSupport);
-#endif
 }
 
 void tst_QQuickWebEngineViewGraphics::init()
@@ -204,9 +200,7 @@ void tst_QQuickWebEngineViewGraphics::setHtml(const QString &html)
 
     QQuickWebEngineView *webEngineView = static_cast<QQuickWebEngineView *>(m_view->rootObject());
     webEngineView->setProperty("url", QUrl(QStringLiteral("data:text/html,%1").arg(htmlData)));
-#ifdef ENABLE_QML_TESTSUPPORT_API
     webEngineView->setTestSupport(m_testSupport.data());
-#endif
     QVERIFY(waitForViewportReady(webEngineView));
     QCOMPARE(m_view->rootObject()->property("loading"), QVariant(false));
 }
-- 
cgit v1.2.3