From 01d0594c9e8fe9bf8c718086c6c57ef1650e612b Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Wed, 28 Feb 2018 13:26:48 +0100
Subject: [PATCH] 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>
---
 tests/auto/wayland/client/tst_client.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/wayland/client/tst_client.cpp b/tests/auto/wayland/client/tst_client.cpp
index 1e0fc5675b8..ab9e5754d39 100644
--- a/tests/auto/wayland/client/tst_client.cpp
+++ b/tests/auto/wayland/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);