From caa632803d4180f7d47eaf8b7c9a7d33578d4048 Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Mon, 23 Nov 2020 17:23:24 +0100 Subject: [PATCH] Disable some OpenGL and QRhi tests for offscreen backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch disables four failing unit tests when executed with the offscreen backend. Change-Id: Ie67341b886984e6de19cd8dd8a8a237a620a1b7a Reviewed-by: Fabian Kosmale Reviewed-by: Tor Arne Vestbø Reviewed-by: Laszlo Agocs --- tests/auto/gui/qopengl/tst_qopengl.cpp | 3 +++ tests/auto/gui/rhi/qrhi/tst_qrhi.cpp | 6 ++++++ .../widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp | 3 ++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/auto/gui/qopengl/tst_qopengl.cpp b/tests/auto/gui/qopengl/tst_qopengl.cpp index 903b617ae87..decd75ae106 100644 --- a/tests/auto/gui/qopengl/tst_qopengl.cpp +++ b/tests/auto/gui/qopengl/tst_qopengl.cpp @@ -1477,6 +1477,9 @@ using namespace QNativeInterface; #ifdef USE_GLX void tst_QOpenGL::glxContextWrap() { + if (QGuiApplication::platformName().startsWith(QLatin1String("offscreen"), Qt::CaseInsensitive)) + QSKIP("Offscreen: This fails."); + QWindow *window = new QWindow; window->setSurfaceType(QWindow::OpenGLSurface); window->setGeometry(0, 0, 10, 10); diff --git a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp index 08a9bb3f956..643720d4fcc 100644 --- a/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp +++ b/tests/auto/gui/rhi/qrhi/tst_qrhi.cpp @@ -2783,6 +2783,9 @@ void tst_QRhi::renderToWindowSimple_data() void tst_QRhi::renderToWindowSimple() { + if (QGuiApplication::platformName().startsWith(QLatin1String("offscreen"), Qt::CaseInsensitive)) + QSKIP("Offscreen: This fails."); + QFETCH(QRhi::Implementation, impl); QFETCH(QRhiInitParams *, initParams); @@ -2918,6 +2921,9 @@ void tst_QRhi::finishWithinSwapchainFrame_data() void tst_QRhi::finishWithinSwapchainFrame() { + if (QGuiApplication::platformName().startsWith(QLatin1String("offscreen"), Qt::CaseInsensitive)) + QSKIP("Offscreen: This fails."); + QFETCH(QRhi::Implementation, impl); QFETCH(QRhiInitParams *, initParams); diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp index 1e99bb4074f..8e21bb70427 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp +++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp @@ -587,7 +587,8 @@ void tst_QOpenGLWidget::stackWidgetOpaqueChildIsVisible() #endif if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"), Qt::CaseInsensitive)) QSKIP("Wayland: This fails. Figure out why."); - + if (QGuiApplication::platformName().startsWith(QLatin1String("offscreen"), Qt::CaseInsensitive)) + QSKIP("Offscreen: This fails."); QStackedWidget stack;