From 034e8e38e3d59ce294e3e6e3306623116a1f6d69 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Thu, 1 Jul 2021 10:13:12 +0200 Subject: Skip grab window and changeLocale() test on QEMU Task-number: QTBUG-94911 Change-Id: Ia381d2914740d0b0172df1af707b6ca1bdfd3d8e Reviewed-by: Allan Sandfeld Jensen --- tests/auto/quick/qquickwebengineview/CMakeLists.txt | 1 + .../auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp | 10 ++++++++++ tests/auto/widgets/qwebengineview/CMakeLists.txt | 1 + tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 4 ++++ 4 files changed, 16 insertions(+) (limited to 'tests') diff --git a/tests/auto/quick/qquickwebengineview/CMakeLists.txt b/tests/auto/quick/qquickwebengineview/CMakeLists.txt index 45c44034a..90cbb7a3d 100644 --- a/tests/auto/quick/qquickwebengineview/CMakeLists.txt +++ b/tests/auto/quick/qquickwebengineview/CMakeLists.txt @@ -9,5 +9,6 @@ qt_internal_add_test(tst_qquickwebengineview Qt::WebEngineQuick Qt::GuiPrivate Qt::WebEngineQuickPrivate + Qt::TestPrivate Test::Util ) diff --git a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp index 63dbf0452..5f141aadc 100644 --- a/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp +++ b/tests/auto/quick/qquickwebengineview/tst_qquickwebengineview.cpp @@ -44,6 +44,7 @@ #include #include #include +#include #include @@ -369,6 +370,9 @@ QImage tryToGrabWindowUntil(QQuickWindow *window, std::functionsetUrl(QUrl(QString::fromUtf8("data:text/html,"))); @@ -408,6 +412,9 @@ void tst_QQuickWebEngineView::titleUpdate() void tst_QQuickWebEngineView::transparentWebEngineViews() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Grab does not work with QEMU."); + showWebEngineView(); // This should not crash. @@ -996,6 +1003,9 @@ void tst_QQuickWebEngineView::inputEventForwardingDisabledWhenActiveFocusOnPress void tst_QQuickWebEngineView::changeLocale() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Does not work with QEMU. (QTBUG-94911)"); + QStringList errorLines; QUrl url("http://non.existent/"); diff --git a/tests/auto/widgets/qwebengineview/CMakeLists.txt b/tests/auto/widgets/qwebengineview/CMakeLists.txt index ac803df41..b06ee7201 100644 --- a/tests/auto/widgets/qwebengineview/CMakeLists.txt +++ b/tests/auto/widgets/qwebengineview/CMakeLists.txt @@ -8,6 +8,7 @@ qt_internal_add_test(tst_qwebengineview Qt::WebEngineCorePrivate Qt::GuiPrivate Qt::QuickWidgets + Qt::TestPrivate Test::Util ) diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index dc0efcfb6..9f9bd7f91 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -47,6 +47,7 @@ #include #include #include +#include #define VERIFY_INPUTMETHOD_HINTS(actual, expect) \ QVERIFY(actual == (expect | Qt::ImhNoPredictiveText | Qt::ImhNoTextHandles | Qt::ImhNoEditMenu)); @@ -1170,6 +1171,9 @@ void tst_QWebEngineView::doNotBreakLayout() void tst_QWebEngineView::changeLocale() { + if (QTestPrivate::isRunningArmOnX86()) + QSKIP("Does not work with QEMU. (QTBUG-94911)"); + QStringList errorLines; QUrl url("http://non.existent/"); -- cgit v1.2.3