From c71e8217eb44f6a9f72c39ebd87b5c7b7cf5a94a Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 1 Apr 2022 18:18:01 +0300 Subject: [PATCH] Android: skip few tst_qopenglwidget tests that crash on CI To allow other cases to run while finding the reason. Most of these cases fail only on CI and not locally. Task-number: QTBUG-102043 Change-Id: Ib552ab00b4232f6aabdf85acf050633251d9e71d Reviewed-by: Ivan Solovev (cherry picked from commit c5dd2c1f35bc7a21c6a2fe18e1e573bcab020bec) --- .../qopenglwidget/tst_qopenglwidget.cpp | 29 ++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp index 7133eeee87e..4942c52b95a 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp +++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp @@ -154,7 +154,7 @@ void tst_QOpenGLWidget::clearAndGrab() void tst_QOpenGLWidget::clearAndResizeAndGrab() { #ifdef Q_OS_ANDROID - QSKIP("Crashes on Android (QTBUG-102043)"); + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); #endif QScopedPointer w(new ClearWidget(0, 640, 480)); w->resize(640, 480); @@ -276,6 +276,9 @@ void tst_QOpenGLWidget::reparentToAlreadyCreated() void tst_QOpenGLWidget::reparentToNotYetCreated() { +#ifdef Q_OS_ANDROID + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); +#endif QWidget w1; PainterWidget *glw = new PainterWidget(&w1); w1.resize(640, 480); @@ -350,6 +353,9 @@ void CountingGraphicsView::drawForeground(QPainter *, const QRectF &) void tst_QOpenGLWidget::asViewport() { +#ifdef Q_OS_ANDROID + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); +#endif // Have a QGraphicsView with a QOpenGLWidget as its viewport. QGraphicsScene scene; scene.addItem(new QGraphicsRectItem(10, 10, 100, 100)); @@ -398,6 +404,9 @@ public: void tst_QOpenGLWidget::requestUpdate() { +#ifdef Q_OS_ANDROID + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); +#endif if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This fails. Figure out why."); @@ -425,6 +434,9 @@ public: void tst_QOpenGLWidget::fboRedirect() { +#ifdef Q_OS_ANDROID + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); +#endif FboCheckWidget w; w.resize(640, 480); w.show(); @@ -440,6 +452,9 @@ void tst_QOpenGLWidget::fboRedirect() void tst_QOpenGLWidget::showHide() { +#ifdef Q_OS_ANDROID + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); +#endif QScopedPointer w(new ClearWidget(0, 800, 600)); w->resize(800, 600); w->show(); @@ -466,6 +481,9 @@ void tst_QOpenGLWidget::showHide() void tst_QOpenGLWidget::nativeWindow() { +#ifdef Q_OS_ANDROID + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); +#endif QScopedPointer w(new ClearWidget(0, 800, 600)); w->resize(800, 600); w->show(); @@ -588,6 +606,9 @@ void tst_QOpenGLWidget::stackWidgetOpaqueChildIsVisible() #ifdef Q_OS_MACOS QSKIP("QScreen::grabWindow() doesn't work properly on OSX HighDPI screen: QTBUG-46803"); return; +#endif +#ifdef Q_OS_ANDROID + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); #endif if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This fails. Figure out why."); @@ -675,6 +696,9 @@ void tst_QOpenGLWidget::offscreen() void tst_QOpenGLWidget::offscreenThenOnscreen() { +#ifdef Q_OS_ANDROID + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); +#endif QScopedPointer w(new ClearWidget(0, 800, 600)); w->resize(800, 600); @@ -700,6 +724,9 @@ void tst_QOpenGLWidget::offscreenThenOnscreen() void tst_QOpenGLWidget::paintWhileHidden() { +#ifdef Q_OS_ANDROID + QSKIP("Crashes on Android, figure out why (QTBUG-102043)"); +#endif QScopedPointer tlw(new QWidget); tlw->resize(640, 480);