fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-05 11:08:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[test] Mark targets with is_meta?

Browse source 
Allow tests to skip targets based on whether they are a meta surface or
not.
This commit is contained in:
Chris Wilson 2008-11-05 08:03:01 +00:00
parent 8855f9583e
commit 68309481aa
3 changed files with 37 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
boilerplate/cairo-boilerplate.c
View file

@ -313,7 +313,9 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_test_meta_create_surface, NULL,
NULL,
_cairo_boilerplate_get_image_surface,
cairo_surface_write_to_png
cairo_surface_write_to_png,
NULL, NULL,
FALSE, TRUE
},
{
"test-meta", "image", NULL,
@ -322,7 +324,9 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_test_meta_create_surface, NULL,
NULL,
_cairo_boilerplate_get_image_surface,
cairo_surface_write_to_png
cairo_surface_write_to_png,
NULL, NULL,
FALSE, TRUE
},
{
"test-paginated", "image", NULL,
@ -332,7 +336,9 @@ static cairo_boilerplate_target_t targets[] =
NULL,
_cairo_boilerplate_test_paginated_get_image_surface,
_cairo_boilerplate_test_paginated_surface_write_to_png,
_cairo_boilerplate_test_paginated_cleanup
_cairo_boilerplate_test_paginated_cleanup,
NULL,
FALSE, TRUE,
},
{
"test-paginated", "image", NULL,
@ -342,7 +348,9 @@ static cairo_boilerplate_target_t targets[] =
NULL,
_cairo_boilerplate_test_paginated_get_image_surface,
_cairo_boilerplate_test_paginated_surface_write_to_png,
_cairo_boilerplate_test_paginated_cleanup
_cairo_boilerplate_test_paginated_cleanup,
NULL,
FALSE, TRUE
},
#endif
#ifdef CAIRO_HAS_GLITZ_SURFACE
@ -457,7 +465,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_win32_printing_get_image_surface,
_cairo_boilerplate_win32_printing_surface_write_to_png,
_cairo_boilerplate_win32_printing_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
{
"win32-printing", "win32"".ps",
@ -467,7 +475,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_win32_printing_get_image_surface,
_cairo_boilerplate_win32_printing_surface_write_to_png,
_cairo_boilerplate_win32_printing_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
#endif
#endif
@ -533,7 +541,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_ps_get_image_surface,
_cairo_boilerplate_ps_surface_write_to_png,
_cairo_boilerplate_ps_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
{
"ps2", "ps", ".ps",
@ -544,7 +552,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_ps_get_image_surface,
_cairo_boilerplate_ps_surface_write_to_png,
_cairo_boilerplate_ps_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
{
"ps3", "ps", ".ps",
@ -556,7 +564,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_ps_get_image_surface,
_cairo_boilerplate_ps_surface_write_to_png,
_cairo_boilerplate_ps_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
{
"ps3", "ps", ".ps",
@ -567,7 +575,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_ps_get_image_surface,
_cairo_boilerplate_ps_surface_write_to_png,
_cairo_boilerplate_ps_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
#endif
#if CAIRO_HAS_PDF_SURFACE && CAIRO_CAN_TEST_PDF_SURFACE
@ -581,7 +589,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_pdf_get_image_surface,
_cairo_boilerplate_pdf_surface_write_to_png,
_cairo_boilerplate_pdf_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
{
"pdf", "pdf", ".pdf",
@ -592,7 +600,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_pdf_get_image_surface,
_cairo_boilerplate_pdf_surface_write_to_png,
_cairo_boilerplate_pdf_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
#endif
#if CAIRO_HAS_SVG_SURFACE && CAIRO_CAN_TEST_SVG_SURFACE
@ -610,7 +618,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_svg_get_image_surface,
_cairo_boilerplate_svg_surface_write_to_png,
_cairo_boilerplate_svg_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
{
"svg11", "svg", NULL,
@ -621,7 +629,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_svg_get_image_surface,
_cairo_boilerplate_svg_surface_write_to_png,
_cairo_boilerplate_svg_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
{
"svg12", "svg", NULL,
@ -632,7 +640,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_svg_get_image_surface,
_cairo_boilerplate_svg_surface_write_to_png,
_cairo_boilerplate_svg_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
{
"svg12", "svg", NULL,
@ -643,7 +651,7 @@ static cairo_boilerplate_target_t targets[] =
_cairo_boilerplate_svg_get_image_surface,
_cairo_boilerplate_svg_surface_write_to_png,
_cairo_boilerplate_svg_cleanup,
NULL, TRUE
NULL, TRUE, TRUE
},
#endif
#if CAIRO_HAS_BEOS_SURFACE

1
boilerplate/cairo-boilerplate.h
View file

@ -162,6 +162,7 @@ typedef struct _cairo_boilerplate_target
cairo_boilerplate_cleanup_t cleanup;
cairo_boilerplate_wait_t synchronize;
cairo_bool_t is_vector;
cairo_bool_t is_meta;
} cairo_boilerplate_target_t;
cairo_boilerplate_target_t **

13
test/cairo-test.c
View file

@ -704,7 +704,9 @@ cairo_test_for_target (cairo_test_context_t *ctx,
xasprintf (&diff_path, "%s" CAIRO_TEST_DIFF_SUFFIX, base_path);
if (ctx->test->requirements != NULL) {
const char *required = target->is_vector ? "target=raster" : "target=vector";
const char *required;
required = target->is_vector ? "target=raster" : "target=vector";
if (strstr (ctx->test->requirements, required) != NULL) {
cairo_test_log (ctx, "Error: Skipping for %s target %s\n",
target->is_vector ? "vector" : "raster",
@ -712,6 +714,15 @@ cairo_test_for_target (cairo_test_context_t *ctx,
ret = CAIRO_TEST_UNTESTED;
goto UNWIND_STRINGS;
}
required = target->is_meta ? "target=!meta" : "target=meta";
if (strstr (ctx->test->requirements, required) != NULL) {
cairo_test_log (ctx, "Error: Skipping for %s target %s\n",
target->is_meta ? "meta" : "non-meta",
target->name);
ret = CAIRO_TEST_UNTESTED;
goto UNWIND_STRINGS;
}
}
width = ctx->test->width;