[cairo-commit] 4 commits - .gitignore test/a1-bug.c test/arc-direction.c test/caps.c test/caps-joins-curve.c test/caps-tails-curve.c test/clip-empty-group.c test/drunkard-tails.c test/image-bug-710072.c test/joins.c test/mesh-pattern-accuracy.c test/mesh-pattern.c test/mesh-pattern-conical.c test/mesh-pattern-control-points.c test/mesh-pattern-fold.c test/mesh-pattern-overlap.c test/mesh-pattern-transformed.c test/partial-coverage.c test/README test/record1414x.c test/rectilinear-dash.c test/rectilinear-dash-scale.c test/scale-offset-image.c test/scale-offset-similar.c test/unclosed-strokes.c
Uli Schlachter
psychon at kemper.freedesktop.org
Fri Sep 13 03:59:32 PDT 2013
.gitignore | 2 ++
test/README | 6 ++++++
test/a1-bug.c | 2 +-
test/arc-direction.c | 2 +-
test/caps-joins-curve.c | 2 +-
test/caps-tails-curve.c | 2 +-
test/caps.c | 8 ++++----
test/clip-empty-group.c | 2 +-
test/drunkard-tails.c | 2 +-
test/image-bug-710072.c | 4 ++--
test/joins.c | 2 +-
test/mesh-pattern-accuracy.c | 2 +-
test/mesh-pattern-conical.c | 2 +-
test/mesh-pattern-control-points.c | 2 +-
test/mesh-pattern-fold.c | 2 +-
test/mesh-pattern-overlap.c | 2 +-
test/mesh-pattern-transformed.c | 2 +-
test/mesh-pattern.c | 2 +-
test/partial-coverage.c | 22 +++++++++++-----------
test/record1414x.c | 4 ++--
test/rectilinear-dash-scale.c | 4 ++--
test/rectilinear-dash.c | 2 +-
test/scale-offset-image.c | 2 +-
test/scale-offset-similar.c | 2 +-
test/unclosed-strokes.c | 2 +-
25 files changed, 47 insertions(+), 39 deletions(-)
New commits:
commit 5390c2bbca3f1331f4fc831ba1381cc64e0162c6
Author: Bryce W. Harrington <b.harrington at samsung.com>
Date: Thu Sep 12 22:55:02 2013 +0000
test: Document use of -k and CAIRO_TEST_TARGET to run test subsets
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
Signed-off-by: Uli Schlachter <psychon at znc.in>
diff --git a/test/README b/test/README
index bbb3596..3f19a5c 100644
--- a/test/README
+++ b/test/README
@@ -26,6 +26,12 @@ run all text related tests you can use:
./cairo-test-suite text
Or if you want to check the current status of known failures:
./cairo-test-suite XFAIL
+Or to run a subset of tests, use the -k option to run only the tests
+that include the given keyword:
+ ./cairo-test-suite -k downscale
+The binary also permits controlling which backend is used via the
+CAIRO_TEST_TARGET environment variable, so for instance:
+ CAIRO_TEST_TARGET=gl ./cairo-test-suite -k blur
This binary should be backwards-compatible with all library versions,
allowing you to compare current versus past behaviour for any test.
commit 640eb0206738e1d1bfd9beebaf0dcb6ac0e07584
Author: Bryce W. Harrington <b.harrington at samsung.com>
Date: Thu Sep 12 22:55:02 2013 +0000
test: Space out keywords for clarity
As another nitpick, a comma alone is legal for separating keywords, but
most tests use a comma and a space. Update the few tests that don't,
to make this consistent.
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
Signed-off-by: Uli Schlachter <psychon at znc.in>
diff --git a/test/image-bug-710072.c b/test/image-bug-710072.c
index 0c9cd8a..9cf0da7 100644
--- a/test/image-bug-710072.c
+++ b/test/image-bug-710072.c
@@ -67,14 +67,14 @@ draw_unaligned (cairo_t *cr, int width, int height)
CAIRO_TEST (image_bug_710072_aligned,
"Tests a bug where we may compute spans greater than bounded extents",
- "extents,fill,stroke", /* keywords */
+ "extents, fill, stroke", /* keywords */
NULL, /* requirements */
15, 15,
NULL, draw_aligned)
CAIRO_TEST (image_bug_710072_unaligned,
"Tests a bug where we may compute spans greater than bounded extents",
- "extents,fill,stroke", /* keywords */
+ "extents, fill, stroke", /* keywords */
NULL, /* requirements */
15, 15,
NULL, draw_unaligned)
diff --git a/test/mesh-pattern-accuracy.c b/test/mesh-pattern-accuracy.c
index 92e1523..d1f60b2 100644
--- a/test/mesh-pattern-accuracy.c
+++ b/test/mesh-pattern-accuracy.c
@@ -93,7 +93,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (mesh_pattern_accuracy,
"Paint mesh pattern",
- "mesh,pattern", /* keywords */
+ "mesh, pattern", /* keywords */
NULL, /* requirements */
SIZE, SIZE,
NULL, draw)
diff --git a/test/mesh-pattern-conical.c b/test/mesh-pattern-conical.c
index 8138884..4e87eec 100644
--- a/test/mesh-pattern-conical.c
+++ b/test/mesh-pattern-conical.c
@@ -129,7 +129,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (mesh_pattern_conical,
"Paint a conical pattern using a mesh pattern",
- "conical,mesh,pattern", /* keywords */
+ "conical, mesh, pattern", /* keywords */
NULL, /* requirements */
WIDTH, HEIGHT,
NULL, draw)
diff --git a/test/mesh-pattern-control-points.c b/test/mesh-pattern-control-points.c
index 4d59495..057e7a1 100644
--- a/test/mesh-pattern-control-points.c
+++ b/test/mesh-pattern-control-points.c
@@ -108,7 +108,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (mesh_pattern_control_points,
"Paint mesh pattern with non default control points",
- "mesh,pattern", /* keywords */
+ "mesh, pattern", /* keywords */
NULL, /* requirements */
WIDTH, HEIGHT,
NULL, draw)
diff --git a/test/mesh-pattern-fold.c b/test/mesh-pattern-fold.c
index 4872bc0..cacd712 100644
--- a/test/mesh-pattern-fold.c
+++ b/test/mesh-pattern-fold.c
@@ -76,7 +76,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (mesh_pattern_fold,
"Paint a mesh pattern with complex folds",
- "mesh,pattern", /* keywords */
+ "mesh, pattern", /* keywords */
NULL, /* requirements */
WIDTH, HEIGHT,
NULL, draw)
diff --git a/test/mesh-pattern-overlap.c b/test/mesh-pattern-overlap.c
index 5ecbf9f..969bc73 100644
--- a/test/mesh-pattern-overlap.c
+++ b/test/mesh-pattern-overlap.c
@@ -70,7 +70,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (mesh_pattern_overlap,
"Paint a mesh pattern with a simple fold",
- "mesh,pattern", /* keywords */
+ "mesh, pattern", /* keywords */
NULL, /* requirements */
WIDTH, HEIGHT,
NULL, draw)
diff --git a/test/mesh-pattern-transformed.c b/test/mesh-pattern-transformed.c
index a5c20e7..5fe0dc0 100644
--- a/test/mesh-pattern-transformed.c
+++ b/test/mesh-pattern-transformed.c
@@ -100,7 +100,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (mesh_pattern_transformed,
"Paint mesh pattern with a transformation",
- "mesh,pattern", /* keywords */
+ "mesh, pattern", /* keywords */
NULL, /* requirements */
WIDTH, HEIGHT,
NULL, draw)
diff --git a/test/mesh-pattern.c b/test/mesh-pattern.c
index 68f1830..eccbd38 100644
--- a/test/mesh-pattern.c
+++ b/test/mesh-pattern.c
@@ -88,7 +88,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (mesh_pattern,
"Paint mesh pattern",
- "mesh,pattern", /* keywords */
+ "mesh, pattern", /* keywords */
NULL, /* requirements */
WIDTH, HEIGHT,
NULL, draw)
diff --git a/test/record1414x.c b/test/record1414x.c
index b8adb86..029e5a4 100644
--- a/test/record1414x.c
+++ b/test/record1414x.c
@@ -444,7 +444,7 @@ record_text_transform (cairo_t *cr, int width, int height)
CAIRO_TEST (record1414x_paint,
"Test replayed calls to cairo_paint",
- "paint,record", /* keywords */
+ "paint, record", /* keywords */
NULL, /* requirements */
M_SQRT2*8, M_SQRT2*8,
NULL, record_paint)
@@ -474,7 +474,7 @@ CAIRO_TEST (record1414x_paint_alpha_clip_mask,
NULL, record_paint_alpha_clip_mask)
CAIRO_TEST (record1414x_fill_alpha,
"Tests using set_rgba();fill()",
- "record,fill, alpha", /* keywords */
+ "record, fill, alpha", /* keywords */
NULL, /* requirements */
M_SQRT2*(2*SIZE + 4*PAD), M_SQRT2*(2*SIZE + 4*PAD),
NULL, record_fill_alpha)
commit a6ace0cf6b96930c08397c64bffabc4b201ab4e8
Author: Bryce W. Harrington <b.harrington at samsung.com>
Date: Thu Sep 12 22:55:02 2013 +0000
test: Comma separate keywords
The parser accepts spaces as separtors between keywords, so this is nit
picky. But only a minority of tests don't follow the comma convention,
so change them to be consistent.
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
Signed-off-by: Uli Schlachter <psychon at znc.in>
diff --git a/test/a1-bug.c b/test/a1-bug.c
index 9166ff5..8e00d40 100644
--- a/test/a1-bug.c
+++ b/test/a1-bug.c
@@ -55,7 +55,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (a1_bug,
"Check the fidelity of the rasterisation.",
- "a1 raster", /* keywords */
+ "a1, raster", /* keywords */
"target=raster", /* requirements */
1000, 800,
NULL, draw)
diff --git a/test/arc-direction.c b/test/arc-direction.c
index fddb528..92c1a8d 100644
--- a/test/arc-direction.c
+++ b/test/arc-direction.c
@@ -98,7 +98,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (arc_direction,
"Test drawing positive/negative arcs",
- "arc fill", /* keywords */
+ "arc, fill", /* keywords */
NULL, /* requirements */
2*(3*PAD + 2*SIZE), 2*(3*PAD + 2*SIZE),
NULL, draw)
diff --git a/test/caps-joins-curve.c b/test/caps-joins-curve.c
index 1b2fc7f..cf19754 100644
--- a/test/caps-joins-curve.c
+++ b/test/caps-joins-curve.c
@@ -103,7 +103,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (caps_joins_curve,
"Test caps and joins on curves",
- "stroke cap join", /* keywords */
+ "stroke, cap, join", /* keywords */
NULL, /* requirements */
3 * (PAD + SIZE) + PAD,
2 * (PAD + SIZE) + PAD,
diff --git a/test/caps-tails-curve.c b/test/caps-tails-curve.c
index 0dc8b31..25e5819 100644
--- a/test/caps-tails-curve.c
+++ b/test/caps-tails-curve.c
@@ -119,7 +119,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (caps_tails_curve,
"Test caps and joins on short tail segments",
- "stroke cap join", /* keywords */
+ "stroke, cap, join", /* keywords */
NULL, /* requirements */
9 * (PAD + SIZE) + 4*PAD,
12 * (PAD + SIZE) + PAD,
diff --git a/test/caps.c b/test/caps.c
index cde2773..87f008a 100644
--- a/test/caps.c
+++ b/test/caps.c
@@ -106,7 +106,7 @@ draw_05 (cairo_t *cr, int width, int height)
CAIRO_TEST (caps,
"Test caps",
- "stroke caps", /* keywords */
+ "stroke, caps", /* keywords */
NULL, /* requirements */
PAD + SIZE + PAD,
3 * (PAD + SIZE) + PAD,
@@ -114,7 +114,7 @@ CAIRO_TEST (caps,
CAIRO_TEST (caps_2,
"Test normal caps",
- "stroke caps", /* keywords */
+ "stroke, caps", /* keywords */
NULL, /* requirements */
PAD + SIZE + PAD,
3 * (PAD + SIZE) + PAD,
@@ -122,7 +122,7 @@ CAIRO_TEST (caps_2,
CAIRO_TEST (caps_1,
"Test hairline caps",
- "stroke caps", /* keywords */
+ "stroke, caps", /* keywords */
NULL, /* requirements */
PAD + SIZE + PAD,
3 * (PAD + SIZE) + PAD,
@@ -130,7 +130,7 @@ CAIRO_TEST (caps_1,
CAIRO_TEST (caps_05,
"Test fine caps",
- "stroke caps", /* keywords */
+ "stroke, caps", /* keywords */
NULL, /* requirements */
PAD + SIZE + PAD,
3 * (PAD + SIZE) + PAD,
diff --git a/test/clip-empty-group.c b/test/clip-empty-group.c
index 20e95c2..3829c88 100644
--- a/test/clip-empty-group.c
+++ b/test/clip-empty-group.c
@@ -59,7 +59,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (clip_empty_group,
"Test handling of groups with everything clipped",
- "clip group", /* keywords */
+ "clip, group", /* keywords */
NULL, /* requirements */
40, 40,
NULL, draw)
diff --git a/test/drunkard-tails.c b/test/drunkard-tails.c
index 3d3e09a..f55c7be 100644
--- a/test/drunkard-tails.c
+++ b/test/drunkard-tails.c
@@ -127,7 +127,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (drunkard_tails,
"Test caps and joins on short tail segments",
- "stroke cap join", /* keywords */
+ "stroke, cap, join", /* keywords */
NULL, /* requirements */
3 * (PAD + SIZE) + PAD,
2 * (PAD + SIZE) + PAD,
diff --git a/test/joins.c b/test/joins.c
index 66847dc..40ef72e 100644
--- a/test/joins.c
+++ b/test/joins.c
@@ -101,7 +101,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (joins,
"Test joins",
- "stroke joins", /* keywords */
+ "stroke, joins", /* keywords */
NULL, /* requirements */
3 * (PAD + SIZE) + PAD,
3 * (PAD + SIZE) + PAD,
diff --git a/test/partial-coverage.c b/test/partial-coverage.c
index 0b5cbdc..7e67a5e 100644
--- a/test/partial-coverage.c
+++ b/test/partial-coverage.c
@@ -611,70 +611,70 @@ intersecting_triangles (cairo_t *cr, int width, int height)
CAIRO_TEST (partial_coverage_rectangles,
"Check the fidelity of the rasterisation.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster slow", /* requirements */
SIZE, SIZE,
NULL, rectangles)
CAIRO_TEST (partial_coverage_intersecting_quads,
"Check the fidelity of the rasterisation.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster slow", /* requirements */
SIZE, SIZE,
NULL, intersecting_quads)
CAIRO_TEST (partial_coverage_intersecting_triangles,
"Check the fidelity of the rasterisation.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster slow", /* requirements */
SIZE, SIZE,
NULL, intersecting_triangles)
CAIRO_TEST (partial_coverage_triangles,
"Check the fidelity of the rasterisation.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster slow", /* requirements */
SIZE, SIZE,
NULL, triangles)
CAIRO_TEST (partial_coverage_overlap_three_quarter_triangles,
"Check the fidelity of the rasterisation.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster slow", /* requirements */
SIZE, SIZE,
NULL, overlap_three_quarter_triangles)
CAIRO_TEST (partial_coverage_overlap_half_triangles_eo,
"Check the fidelity of the rasterisation.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster slow", /* requirements */
SIZE, SIZE,
NULL, overlap_half_triangles_eo)
CAIRO_TEST (partial_coverage_overlap_half_triangles,
"Check the fidelity of the rasterisation.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster slow", /* requirements */
SIZE, SIZE,
NULL, overlap_half_triangles)
CAIRO_TEST (partial_coverage_half_triangles,
"Check the fidelity of the rasterisation.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster slow", /* requirements */
SIZE, SIZE,
NULL, half_triangles)
CAIRO_TEST (partial_coverage_reference,
"Check the fidelity of this test.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster", /* requirements */
SIZE, SIZE,
NULL, reference)
CAIRO_TEST (partial_coverage_three_quarter_reference,
"Check the fidelity of this test.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster", /* requirements */
SIZE, SIZE,
NULL, three_quarter_reference)
CAIRO_TEST (partial_coverage_half_reference,
"Check the fidelity of this test.",
- "coverage raster", /* keywords */
+ "coverage, raster", /* keywords */
"target=raster", /* requirements */
SIZE, SIZE,
NULL, half_reference)
diff --git a/test/rectilinear-dash-scale.c b/test/rectilinear-dash-scale.c
index 1b69516..34f3345 100644
--- a/test/rectilinear-dash-scale.c
+++ b/test/rectilinear-dash-scale.c
@@ -183,14 +183,14 @@ unaligned (cairo_t *cr, int width, int height)
CAIRO_TEST (rectilinear_dash_scale,
"Test dashed rectilinear stroke operations (covering only whole pixels) after scaling",
- "stroke dash", /* keywords */
+ "stroke, dash", /* keywords */
NULL, /* requirements */
4*SIZE, 2*SIZE,
NULL, aligned)
CAIRO_TEST (rectilinear_dash_scale_unaligned,
"Test dashed rectilinear stroke operations (covering partial pixels) after scaling",
- "stroke dash", /* keywords */
+ "stroke, dash", /* keywords */
NULL, /* requirements */
4*SIZE, 2*SIZE,
NULL, unaligned)
diff --git a/test/rectilinear-dash.c b/test/rectilinear-dash.c
index fe998bb..954a2a0 100644
--- a/test/rectilinear-dash.c
+++ b/test/rectilinear-dash.c
@@ -169,7 +169,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (rectilinear_dash,
"Test dashed rectilinear stroke operations (covering only whole pixels)",
- "stroke dash", /* keywords */
+ "stroke, dash", /* keywords */
NULL, /* requirements */
SIZE, SIZE,
NULL, draw)
diff --git a/test/scale-offset-image.c b/test/scale-offset-image.c
index 0eef22e..a6e575a 100644
--- a/test/scale-offset-image.c
+++ b/test/scale-offset-image.c
@@ -135,7 +135,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (scale_offset_image,
"Tests drawing surfaces under various scales and transforms",
- "surface scale-offset", /* keywords */
+ "surface, scale-offset", /* keywords */
NULL, /* requirements */
320, 320,
NULL, draw)
diff --git a/test/scale-offset-similar.c b/test/scale-offset-similar.c
index daf7ffe..e9e6a2b 100644
--- a/test/scale-offset-similar.c
+++ b/test/scale-offset-similar.c
@@ -136,7 +136,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (scale_offset_similar,
"Tests drawing surfaces under various scales and transforms",
- "surface scale-offset", /* keywords */
+ "surface, scale-offset", /* keywords */
NULL, /* requirements */
320, 320,
NULL, draw)
diff --git a/test/unclosed-strokes.c b/test/unclosed-strokes.c
index 3c0287f..40a76eb 100644
--- a/test/unclosed-strokes.c
+++ b/test/unclosed-strokes.c
@@ -75,7 +75,7 @@ draw (cairo_t *cr, int width, int height)
CAIRO_TEST (unclosed_strokes,
"Test coincident end-points are capped and not joined",
- "stroke caps", /* keywords */
+ "stroke, caps", /* keywords */
NULL, /* requirements */
PAD + SIZE + PAD,
3 * (PAD + SIZE) + PAD,
commit aacc5e76ed39b69595194a23e94bbd6483dd88a6
Author: Bryce W. Harrington <b.harrington at samsung.com>
Date: Thu Sep 12 22:55:01 2013 +0000
gitignore: Ignore build chaff when configuring with --enable-gtk-doc
When this flag is enabled in configure, a couple extra build files are
created, which git should just ignore.
Signed-off-by: Bryce Harrington <b.harrington at samsung.com>
Signed-off-by: Uli Schlachter <psychon at znc.in>
diff --git a/.gitignore b/.gitignore
index cef6930..301ba6d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ Makefile.in
aclocal.m4
autom4te.cache
autoscan.log
+build/gtk-doc.m4
config.cache
config.h
config.h.in
@@ -17,6 +18,7 @@ configure
configure.scan
doltcompile
doltlibtool
+gtk-doc.make
libtool
releases
stamp-h
More information about the cairo-commit
mailing list