[Libreoffice-commits] core.git: cppcanvas/qa

Michael Meeks michael.meeks at suse.com
Tue Jun 11 08:37:32 PDT 2013


 cppcanvas/qa/unit/test.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 58b8211f4aa0b227151890d541efa17d04058e05
Author: Michael Meeks <michael.meeks at suse.com>
Date:   Tue Jun 11 16:35:49 2013 +0100

    canvas unit test - tolerate canvas non-creation: really no X server...
    
    Change-Id: Id8be7bc4ad454e7e246e412803e4d672a921c08e

diff --git a/cppcanvas/qa/unit/test.cxx b/cppcanvas/qa/unit/test.cxx
index 03d0e73..af652a3 100644
--- a/cppcanvas/qa/unit/test.cxx
+++ b/cppcanvas/qa/unit/test.cxx
@@ -44,7 +44,8 @@ void CanvasTest::testComposite()
     CPPUNIT_ASSERT( pWin != NULL );
 
     uno::Reference<rendering::XCanvas> xCanvas = pWin->GetCanvas ();
-    CPPUNIT_ASSERT( xCanvas.is() );
+    if( !xCanvas.is() )
+        return; // can't get a canvas working at all - truly headless ?
 
     // a huge canvas ...
     Size aSize (1, 1);


More information about the Libreoffice-commits mailing list