diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:09:24 +0200 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:09:24 +0200 |
commit | 5aedae5aa9251e1216d7bc1652cb1f451dd047c1 (patch) | |
tree | 1e3c00ccac6cb4082d8bd3e52f047f8cbc058b61 /tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp | |
parent | 532e108a3abf56aa0ef709af5049ce3b2161ed84 (diff) | |
parent | df5a63b059956e8a717db9110327cc86612cc934 (diff) |
Merge 5.14 into 5.14.1v5.14.1
Change-Id: Ia93046662955494eccd3f4da80f015fe5148b026
Diffstat (limited to 'tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp')
-rw-r--r-- | tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp index 9eec010be..00e4890c8 100644 --- a/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp +++ b/tests/auto/global/aspects_startup_shutdown/tst_aspects_startup_shutdown.cpp @@ -143,6 +143,8 @@ private slots: void checkStartupAndShutdownImmediately() { + QSKIP("Fails on CI for some unexplained reason"); + // GIVEN QWindow *win = new QWindow(); win->setSurfaceType(QSurface::OpenGLSurface); @@ -170,6 +172,8 @@ private slots: void checkStartupAndShutdownAfterAFewFrames() { + QSKIP("Fails on CI for some unexplained reason"); + // GIVEN QWindow *win = new QWindow(); win->setSurfaceType(QSurface::OpenGLSurface); |