[cairo-commit] cairo/test cairo-test.c,1.53,1.54

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv11039/test

Modified Files:
	cairo-test.c 
Log Message:

2005-08-20  Carl Worth  <cworth at cworth.org>

        Fix for bug #4142:

        * test/cairo-test.c (create_xlib_surface): Disable xlib tests on X
        servers without the Render, since they currently just crash
        there. A better long-term fix would be to do some useful tests in
        this case. Thanks to Tim Mooney.


Index: cairo-test.c
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- cairo-test.c	18 Aug 2005 16:19:21 -0000	1.53
+++ cairo-test.c	20 Aug 2005 14:56:05 -0000	1.54
@@ -382,7 +382,19 @@
 	return NULL;
     }
 
+    /* XXX: Currently we don't do any xlib testing when the X server
+     * doesn't have the Render extension. We could do better here,
+     * (perhaps by converting the tests from ARGB32 to RGB24). One
+     * step better would be to always test the non-Render fallbacks
+     * for each test even if the server does have the Render
+     * extension. That would probably be through another
+     * cairo_test_target which would use an extended version of
+     * cairo_test_xlib_disable_render.  */
     xrender_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
+    if (xrender_format == NULL) {
+	cairo_test_log ("X server does not have the Render extension.\n");
+	return NULL;
+    }
     
     xtc->pixmap = XCreatePixmap (dpy, DefaultRootWindow (dpy),
 				 width, height, xrender_format->depth);