From 504866ffcf57461774bc39357b23954df3a2d9ee Mon Sep 17 00:00:00 2001
From: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Date: Thu, 6 Aug 2009 13:25:43 +0200
Subject: Skip tst_QWindowSurface::flushOutsidePaintEvent() when using
 composition manager

The first VERIFY_COLOR(w.geometry(), w.color); call was failing because
the window was mapped but not yet painted on the screen.

Reviewed-by: Bradley T. Hughes
---
 tests/auto/qwindowsurface/tst_qwindowsurface.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tests/auto/qwindowsurface')

diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
index ddd193008b..b03cd05a16 100644
--- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
+++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp
@@ -48,6 +48,7 @@
 
 #include <private/qwindowsurface_p.h>
 #include <QDesktopWidget>
+#include <QX11Info>
 
 class tst_QWindowSurface : public QObject
 {
@@ -138,6 +139,11 @@ void tst_QWindowSurface::getSetWindowSurface()
 
 void tst_QWindowSurface::flushOutsidePaintEvent()
 {
+#ifdef Q_WS_X11
+    if (QX11Info::isCompositingManagerRunning())
+        QSKIP("Test is unreliable with composition manager", SkipAll);
+#endif
+
 #ifdef Q_WS_WIN
     if (QSysInfo::WindowsVersion & QSysInfo::WV_VISTA) {
         QTest::qWait(1000);
-- 
cgit v1.2.3