summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2018-02-28 13:26:48 +0100
committerDavid Edmundson <davidedmundson@kde.org>2018-02-28 16:16:45 +0000
commit0a789ec6aa89e3abed43bc681e90ca320c539b08 (patch)
treeaf342112f83e97a98d025e10c77bafc33b5d64a6 /tests
parentced351295b67f0c8ef72802a11d2a0f2381b46e8 (diff)
Ensure paintGL() is called in tst_WaylandClient::glWindow()
The test is still skipped due to CI problems, though (QTBUG-65802). Task-number: QTBUG-66511 Change-Id: I79a67a80708de4cf2a7347a96c4b6344182d3ae0 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/client/client/tst_client.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp
index 1e0fc5675..ab9e5754d 100644
--- a/tests/auto/client/client/tst_client.cpp
+++ b/tests/auto/client/client/tst_client.cpp
@@ -113,6 +113,7 @@ class TestGlWindow : public QOpenGLWindow
public:
TestGlWindow();
+ uint paintGLCalled = 0;
protected:
void paintGL() override;
@@ -124,6 +125,7 @@ TestGlWindow::TestGlWindow()
void TestGlWindow::paintGL()
{
glClear(GL_COLOR_BUFFER_BIT);
+ ++paintGLCalled;
}
class tst_WaylandClient : public QObject
@@ -550,6 +552,8 @@ void tst_WaylandClient::glWindow()
QSharedPointer<MockSurface> surface;
QTRY_VERIFY(surface = compositor->surface());
+ QTRY_VERIFY(testWindow->paintGLCalled);
+
//confirm we don't crash when we delete an already hidden GL window
//QTBUG-65553
testWindow->setVisible(false);