From a9dcd2a0377424550c538f61f4182d3a495bcab2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 16 Feb 2022 11:58:23 +0100 Subject: tests: XFAIL 4 tests in tst_QWindow on Wayland MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-66818 Task-number: QTBUG-100887 Task-number: QTBUG-100888 Task-number: QTBUG-100889 Change-Id: I05ba11e54c115380bbbb629fcba5cdd658dd5654 Reviewed-by: Tor Arne Vestbø (cherry picked from commit c1b68869590a96c4d448ab3e9b7b18213ec65c0c) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 23ee51501a..317892c58e 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -524,7 +524,7 @@ static QString msgRectMismatch(const QRect &r1, const QRect &r2) static bool isPlatformWayland() { - return !QGuiApplication::platformName().compare(QLatin1String("wayland"), Qt::CaseInsensitive); + return QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive); } void tst_QWindow::positioning() @@ -644,9 +644,6 @@ void tst_QWindow::childWindowPositioning_data() void tst_QWindow::childWindowPositioning() { - if (isPlatformWayland()) - QSKIP("Wayland: This is flaky (protocol errors for xdg-shell v6). See QTBUG-67648."); - const QPoint topLeftOrigin(0, 0); ColoredWindow topLevelWindowFirst(Qt::green); @@ -1323,6 +1320,8 @@ void tst_QWindow::mouseToTouchTranslation() QTRY_COMPARE(window.touchPressedCount, 1); QTRY_COMPARE(window.touchReleasedCount, 1); QCOMPARE(window.mouseDevice, window.touchDevice); + if (isPlatformWayland()) + QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100887.", Abort); QCOMPARE(window.touchDevice->type(), QInputDevice::DeviceType::Mouse); QCOMPARE(window.touchPressLocalPos.toPoint(), localPos); QCOMPARE(window.touchPressGlobalPos.toPoint(), window.mapToGlobal(localPos)); @@ -1480,9 +1479,6 @@ void tst_QWindow::touchCancelWithTouchToMouse() void tst_QWindow::touchInterruptedByPopup() { - if (isPlatformWayland()) - QSKIP("Wayland: This test crashes with xdg-shell unstable v6"); - InputTestWindow window; window.setTitle(QLatin1String(QTest::currentTestFunction())); window.setGeometry(QRect(m_availableTopLeft + QPoint(80, 80), m_testWindowSize)); @@ -2090,9 +2086,6 @@ void tst_QWindow::mask() void tst_QWindow::initialSize() { - if (isPlatformWayland()) - QSKIP("Wayland: This fails. See QTBUG-66818."); - QSize defaultSize(0,0); { Window w; @@ -2107,6 +2100,8 @@ void tst_QWindow::initialSize() w.setTitle(QLatin1String(QTest::currentTestFunction())); w.setWidth(m_testWindowSize.width()); w.showNormal(); + if (isPlatformWayland()) + QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-66818.", Abort); QTRY_COMPARE(w.width(), m_testWindowSize.width()); QTRY_VERIFY(w.height() > 0); } @@ -2290,6 +2285,8 @@ void tst_QWindow::modalWindowPosition() window.setModality(Qt::WindowModal); window.show(); QVERIFY(QTest::qWaitForWindowExposed(&window)); + if (isPlatformWayland()) + QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100888.", Abort); QCOMPARE(window.geometry(), origGeo); } @@ -2568,6 +2565,8 @@ void tst_QWindow::requestUpdate() QCoreApplication::processEvents(); QTRY_VERIFY(window.isExposed()); + if (isPlatformWayland()) + QEXPECT_FAIL("", "Wayland: This fails. See QTBUG-100889.", Abort); QCOMPARE(window.received(QEvent::UpdateRequest), 0); window.requestUpdate(); -- cgit v1.2.3