[cairo-commit] 4 commits - test/cairo-test.c test/gradient-constant-alpha-ps2-ref.png test/gradient-constant-alpha-ps2-rgb24-ref.png test/large-source.c test/Makefile.am
Chris Wilson
ickle at kemper.freedesktop.org
Sat Sep 27 11:35:48 PDT 2008
dev/null |binary
test/Makefile.am | 52 +++++++++++++++++++++++++++++++---------------------
test/cairo-test.c | 11 +++++++----
test/large-source.c | 3 ---
4 files changed, 38 insertions(+), 28 deletions(-)
New commits:
commit 39e4a0bcd04191eecfc593653a4ba32a28fcac6a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Sep 27 19:33:51 2008 +0100
[test] Update list of REFERENCE_IMAGES
A few typos, deletions and additions from the inclusion of versioned
SVG/PS testing.
diff --git a/test/Makefile.am b/test/Makefile.am
index 34ca09e..75a561f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -337,6 +337,7 @@ REFERENCE_IMAGES = \
clip-operator-pdf-rgb24-ref.png \
clip-operator-ps2-rgb24-ref.png \
clip-operator-ps3-rgb24-ref.png \
+ clip-operator-ps3-ref.png \
clip-operator-rgb24-ref.png \
clip-operator-quartz-ref.png \
clip-operator-quartz-rgb24-ref.png \
@@ -409,9 +410,9 @@ REFERENCE_IMAGES = \
degenerate-pen-ps3-ref.png \
degenerate-pen-quartz-ref.png \
degenerate-path-ps2-argb32-ref.png \
- degenerate-path-ps3-argb32-ref.png \
- degenerate-path-ps2-rgb24-ref.png \
degenerate-path-ps2-rgb24-ref.png \
+ degenerate-path-ps3-argb32-ref.png \
+ degenerate-path-ps3-rgb24-ref.png \
degenerate-path-ref.png \
degenerate-path-rgb24-ref.png \
degenerate-path-quartz-ref.png \
@@ -573,12 +574,14 @@ REFERENCE_IMAGES = \
long-dashed-lines-quartz-ref.png \
long-lines-ref.png \
mask-alpha-ref.png \
- mask-alpha-svg-argb32-ref.png \
+ mask-alpha-svg11-argb32-ref.png \
+ mask-alpha-svg12-argb32-ref.png \
mask-alpha-rgb24-ref.png \
mask-alpha-quartz-argb32-ref.png \
mask-ctm-ref.png \
mask-ctm-rgb24-ref.png \
- mask-ctm-svg-argb32-ref.png \
+ mask-ctm-svg11-argb32-ref.png \
+ mask-ctm-svg12-argb32-ref.png \
mask-ref.png \
mask-rgb24-ref.png \
mask-pdf-argb32-ref.png \
@@ -587,9 +590,12 @@ REFERENCE_IMAGES = \
mask-quartz-rgb24-ref.png \
mask-surface-ctm-ref.png \
mask-surface-ctm-rgb24-ref.png \
- mask-surface-ctm-svg-argb32-ref.png \
- mask-svg-rgb24-ref.png \
- mask-svg-argb32-ref.png \
+ mask-surface-ctm-svg11-argb32-ref.png \
+ mask-surface-ctm-svg12-argb32-ref.png \
+ mask-svg11-rgb24-ref.png \
+ mask-svg11-argb32-ref.png \
+ mask-svg12-rgb24-ref.png \
+ mask-svg12-argb32-ref.png \
mask-transformed-image-ref.png \
mask-transformed-similar-ref.png \
mask-transformed-similar-pdf-ref.png \
@@ -600,13 +606,15 @@ REFERENCE_IMAGES = \
meta-surface-pattern-pdf-ref.png \
meta-surface-pattern-pdf-rgb24-ref.png \
meta-surface-pattern-ps2-argb32-ref.png \
- meta-surface-pattern-ps3-rgb24-ref.png \
- meta-surface-pattern-ps2-argb32-ref.png \
+ meta-surface-pattern-ps2-rgb24-ref.png \
+ meta-surface-pattern-ps3-argb32-ref.png \
meta-surface-pattern-ps3-rgb24-ref.png \
meta-surface-pattern-quartz-ref.png \
meta-surface-pattern-quartz-rgb24-ref.png \
- meta-surface-pattern-svg-argb32-ref.png \
- meta-surface-pattern-svg-rgb24-ref.png \
+ meta-surface-pattern-svg11-argb32-ref.png \
+ meta-surface-pattern-svg11-rgb24-ref.png \
+ meta-surface-pattern-svg12-argb32-ref.png \
+ meta-surface-pattern-svg12-rgb24-ref.png \
miter-precision-ref.png \
miter-precision-ps2-ref.png \
miter-precision-ps3-ref.png \
@@ -681,7 +689,8 @@ REFERENCE_IMAGES = \
push-group-pdf-rgb24-ref.png \
push-group-ref.png \
push-group-rgb24-ref.png \
- push-group-svg-argb32-ref.png \
+ push-group-svg11-argb32-ref.png \
+ push-group-svg12-argb32-ref.png \
radial-gradient-ref.png \
radial-gradient-pdf-ref.png \
radial-gradient-quartz-ref.png \
@@ -720,8 +729,10 @@ REFERENCE_IMAGES = \
scale-source-surface-paint-pdf-argb32-ref.png \
scale-source-surface-paint-ref.png \
scale-source-surface-paint-rgb24-ref.png \
- scale-source-surface-paint-svg-argb32-ref.png \
- scale-source-surface-paint-svg-rgb24-ref.png \
+ scale-source-surface-paint-svg11-argb32-ref.png \
+ scale-source-surface-paint-svg11-rgb24-ref.png \
+ scale-source-surface-paint-svg12-argb32-ref.png \
+ scale-source-surface-paint-svg12-rgb24-ref.png \
scale-source-surface-paint-pdf-rgb24-ref.png \
stroke-ctm-caps-ref.png \
stroke-ctm-caps-quartz-ref.png \
@@ -738,7 +749,8 @@ REFERENCE_IMAGES = \
self-intersecting-rgb24-ref.png \
set-source-ref.png \
set-source-rgb24-ref.png \
- set-source-svg-argb32-ref.png \
+ set-source-svg11-argb32-ref.png \
+ set-source-svg12-argb32-ref.png \
show-glyphs-many-ref.png \
show-text-current-point-ref.png \
show-text-current-point-ps2-ref.png \
@@ -824,8 +836,10 @@ REFERENCE_IMAGES = \
text-pattern-ps3-rgb24-ref.png \
text-pattern-ref.png \
text-pattern-rgb24-ref.png \
- text-pattern-svg-argb32-ref.png \
- text-pattern-svg-rgb24-ref.png \
+ text-pattern-svg11-argb32-ref.png \
+ text-pattern-svg11-rgb24-ref.png \
+ text-pattern-svg12-argb32-ref.png \
+ text-pattern-svg12-rgb24-ref.png \
text-pattern-pdf-argb32-ref.png \
text-pattern-pdf-rgb24-ref.png \
text-pattern-quartz-ref.png \
@@ -847,9 +861,7 @@ REFERENCE_IMAGES = \
translate-show-surface-ref.png \
trap-clip-quartz-ref.png \
trap-clip-quartz-rgb24-ref.png \
- trap-clip-ps2-argb32-ref.png \
trap-clip-ps3-argb32-ref.png \
- trap-clip-ps2-rgb24-ref.png \
trap-clip-ps3-rgb24-ref.png \
trap-clip-ref.png \
trap-clip-rgb24-ref.png \
commit 260362e5728e2591bb50f565ef04ba951d95de79
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Sep 27 19:16:34 2008 +0100
[cairo-test] Fix cairo_test_file_is_older().
It did not even compile, so no longer it wasn't deleting cached results
if you updated the reference images.
diff --git a/test/cairo-test.c b/test/cairo-test.c
index 99d767a..36d88de 100644
--- a/test/cairo-test.c
+++ b/test/cairo-test.c
@@ -48,6 +48,9 @@
#ifdef HAVE_PTHREAD_H
#include <pthread.h>
#endif
+#ifdef HAVE_SYS_STAT_H
+#include <sys/stat.h>
+#endif
#include "cairo-test.h"
@@ -432,7 +435,7 @@ static cairo_bool_t
cairo_test_file_is_older (const char *filename,
const char *ref_filename)
{
-#ifdef HAVE_STAT
+#ifdef HAVE_SYS_STAT_H
struct stat st, ref;
if (stat (filename, &st) < 0)
@@ -441,7 +444,7 @@ cairo_test_file_is_older (const char *filename,
if (stat (ref_filename, &ref) < 0)
return TRUE;
- return st.m_time < ref.m_time;
+ return st.st_mtime < ref.st_mtime;
#else
/* XXX */
return FALSE;
@@ -733,7 +736,7 @@ cairo_test_for_target (cairo_test_context_t *ctx,
if (cairo_test_file_is_older (pass_filename, ref_name))
_xunlink (ctx, pass_filename);
if (cairo_test_file_is_older (fail_filename, ref_name))
- _xunlink (ctx, pass_filename);
+ _xunlink (ctx, fail_filename);
if (cairo_test_files_equal (test_filename, pass_filename)) {
/* identical output as last known PASS */
@@ -783,7 +786,7 @@ cairo_test_for_target (cairo_test_context_t *ctx,
if (cairo_test_file_is_older (pass_filename, ref_name))
_xunlink (ctx, pass_filename);
if (cairo_test_file_is_older (fail_filename, ref_name))
- _xunlink (ctx, pass_filename);
+ _xunlink (ctx, fail_filename);
if (cairo_test_files_equal (test_filename, pass_filename)) {
/* identical output as last known PASS, pass */
commit ffbb67303c1a4d986096ba046bb3256314b9f1b1
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Sep 27 18:54:45 2008 +0100
[test/gradient-constant-alpha] Remove ps2 reference images.
PostScript level 2 has no support for gradients and so should uses image
fallbacks and hence do not require the GS specific reference images.
diff --git a/test/Makefile.am b/test/Makefile.am
index fcc3fc8..34ca09e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -525,9 +525,7 @@ REFERENCE_IMAGES = \
gradient-alpha-rgb24-ref.png \
gradient-constant-alpha-pdf-argb32-ref.png \
gradient-constant-alpha-pdf-rgb24-ref.png \
- gradient-constant-alpha-ps2-ref.png \
gradient-constant-alpha-ps3-ref.png \
- gradient-constant-alpha-ps2-rgb24-ref.png \
gradient-constant-alpha-ps3-rgb24-ref.png \
gradient-constant-alpha-ref.png \
gradient-constant-alpha-rgb24-ref.png \
diff --git a/test/gradient-constant-alpha-ps2-ref.png b/test/gradient-constant-alpha-ps2-ref.png
deleted file mode 100644
index 7089f4f..0000000
Binary files a/test/gradient-constant-alpha-ps2-ref.png and /dev/null differ
diff --git a/test/gradient-constant-alpha-ps2-rgb24-ref.png b/test/gradient-constant-alpha-ps2-rgb24-ref.png
deleted file mode 100644
index 5962925..0000000
Binary files a/test/gradient-constant-alpha-ps2-rgb24-ref.png and /dev/null differ
commit 4fa9f8c0608c137d9aa277039cb286c8294e6a2f
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date: Sat Sep 27 17:42:06 2008 +0100
[test/large-source] Remove stale comment.
Delete a reference to an old limitation of pixman.
diff --git a/test/large-source.c b/test/large-source.c
index 1756424..fc8f514 100644
--- a/test/large-source.c
+++ b/test/large-source.c
@@ -30,9 +30,6 @@
* crafted gif file will crash firefox
* [XError: 'BadAlloc (insufficient resources for operation)']
* https://bugzilla.mozilla.org/show_bug.cgi?id=424333
- *
- * The output is currently marked as XFAIL as pixman is still limited
- * to 16.16.
*/
static cairo_test_draw_function_t draw;
More information about the cairo-commit
mailing list