diff options
Diffstat (limited to 'tests/auto/opengl/qgl')
-rw-r--r-- | tests/auto/opengl/qgl/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/opengl/qgl/tst_qgl.cpp | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/auto/opengl/qgl/BLACKLIST b/tests/auto/opengl/qgl/BLACKLIST index 705d8f8926..6ad3dba4a8 100644 --- a/tests/auto/opengl/qgl/BLACKLIST +++ b/tests/auto/opengl/qgl/BLACKLIST @@ -7,3 +7,6 @@ rhel-7.4 opensuse-42.3 sles +# QTBUG-96271 +[closeAndThenShow] +macos-11 diff --git a/tests/auto/opengl/qgl/tst_qgl.cpp b/tests/auto/opengl/qgl/tst_qgl.cpp index 7c43c52236..c5441770f3 100644 --- a/tests/auto/opengl/qgl/tst_qgl.cpp +++ b/tests/auto/opengl/qgl/tst_qgl.cpp @@ -44,6 +44,7 @@ #include <QGraphicsView> #include <QGraphicsProxyWidget> #include <QVBoxLayout> +#include <QOperatingSystemVersion> #ifdef QT_BUILD_INTERNAL #include <qpa/qplatformpixmap.h> @@ -2537,6 +2538,10 @@ public: void tst_QGL::closeAndThenShow() { +#ifdef Q_OS_MACOS + if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSBigSur) + QSKIP("Test is crashing flaky on macos-11.0 - QTBUG-96271"); +#endif QWidget *w = new QWidget; w->resize(640, 480); QVBoxLayout *layout = new QVBoxLayout(w); |