summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-08-31 16:15:53 +0000
committerCarl Worth <cworth@cworth.org>2005-08-31 16:15:53 +0000
commit267f272ab0715fd590d8d8f0b0bae52900db3250 (patch)
treef049f147217755d2ae1f0fb38444a2bbe2a4bb2f
parentd521fa3a759457b1b5ce18f8853507798071b599 (diff)
Add call to XSynchronize, (the expected clip-all failure isn't occuring without it for some reason).
Note reason for expected failure.
-rw-r--r--ChangeLog8
-rw-r--r--test/cairo-test.c2
-rw-r--r--test/clip-all.c3
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ab0cf9837..621db6b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-08-31 Carl Worth <cworth@cworth.org>
+
+ * test/cairo-test.c: (create_xlib_surface): Add call to
+ XSynchronize, (the expected clip-all failure isn't occuring
+ without it for some reason).
+
+ * test/clip-all.c: (main): Note reason for expected failure.
+
2005-08-31 Owen Taylor <otaylor@redhat.com>
* src/cairo-xlib-surface.c (_get_image_surface)
diff --git a/test/cairo-test.c b/test/cairo-test.c
index 18d036bc9..e3dd71280 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -382,6 +382,8 @@ create_xlib_surface (int width, int height, void **closure)
return NULL;
}
+ XSynchronize (xtc->dpy, 1);
+
/* 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
diff --git a/test/clip-all.c b/test/clip-all.c
index 0fbcc4ac1..428445bcb 100644
--- a/test/clip-all.c
+++ b/test/clip-all.c
@@ -65,5 +65,6 @@ draw (cairo_t *cr, int width, int height)
int
main (void)
{
- return cairo_test (&test, draw);
+ return cairo_test_expect_failure (&test, draw,
+ "Need to avoid trying to create size-0 Pixmaps in cairo-xlib");
}