diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2009-09-08 17:51:33 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2009-09-08 17:51:33 +0100 |
commit | 9389cb78a8ea5b6579d091ab1030ab9f1b13efc2 (patch) | |
tree | b5213d8be51e80d1c372336860483734a53cac90 /boilerplate | |
parent | 45759e5a0fb20a632f66a8dd206833b55a95f840 (diff) |
[build] Improve handling of missing test apparatus
Improve detection, reporting and disabling of test backends when we lack
the required libraries and utilities.
Diffstat (limited to 'boilerplate')
-rw-r--r-- | boilerplate/Makefile.win32.features | 7 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-pdf.c | 2 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-ps.c | 2 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-svg.c | 2 |
4 files changed, 13 insertions, 0 deletions
diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index 498d0beb..ee45b084 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -354,3 +354,10 @@ ifeq ($(CAIRO_HAS_TRACE),1) enabled_cairo_boilerplate_private += $(cairo_boilerplate_trace_private) $(cairo_boilerplate_trace_headers) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_trace_sources) endif + +all_cairo_boilerplate_private += $(cairo_boilerplate_interpreter_private) $(cairo_boilerplate_interpreter_headers) +all_cairo_boilerplate_sources += $(cairo_boilerplate_interpreter_sources) +ifeq ($(CAIRO_HAS_INTERPRETER),1) +enabled_cairo_boilerplate_private += $(cairo_boilerplate_interpreter_private) $(cairo_boilerplate_interpreter_headers) +enabled_cairo_boilerplate_sources += $(cairo_boilerplate_interpreter_sources) +endif diff --git a/boilerplate/cairo-boilerplate-pdf.c b/boilerplate/cairo-boilerplate-pdf.c index 591e16fd..191eb1b5 100644 --- a/boilerplate/cairo-boilerplate-pdf.c +++ b/boilerplate/cairo-boilerplate-pdf.c @@ -225,6 +225,7 @@ _cairo_boilerplate_pdf_force_fallbacks (cairo_surface_t *abstract_surface, } static const cairo_boilerplate_target_t targets[] = { +#if CAIRO_CAN_TEST_PDF_SURFACE { "pdf", "pdf", ".pdf", NULL, CAIRO_SURFACE_TYPE_PDF, @@ -250,5 +251,6 @@ static const cairo_boilerplate_target_t targets[] = { _cairo_boilerplate_pdf_cleanup, NULL, TRUE, TRUE }, +#endif }; CAIRO_BOILERPLATE (pdf, targets) diff --git a/boilerplate/cairo-boilerplate-ps.c b/boilerplate/cairo-boilerplate-ps.c index 53fecd6d..899a321b 100644 --- a/boilerplate/cairo-boilerplate-ps.c +++ b/boilerplate/cairo-boilerplate-ps.c @@ -290,6 +290,7 @@ _cairo_boilerplate_ps_force_fallbacks (cairo_surface_t *abstract_surface, } static const cairo_boilerplate_target_t targets[] = { +#if CAIRO_CAN_TEST_PS_SURFACE { "ps2", "ps", ".ps", NULL, CAIRO_SURFACE_TYPE_PS, @@ -340,5 +341,6 @@ static const cairo_boilerplate_target_t targets[] = { _cairo_boilerplate_ps_cleanup, NULL, TRUE, TRUE }, +#endif }; CAIRO_BOILERPLATE (ps, targets) diff --git a/boilerplate/cairo-boilerplate-svg.c b/boilerplate/cairo-boilerplate-svg.c index a8a4d8b9..316e33d3 100644 --- a/boilerplate/cairo-boilerplate-svg.c +++ b/boilerplate/cairo-boilerplate-svg.c @@ -266,6 +266,7 @@ _cairo_boilerplate_svg_force_fallbacks (cairo_surface_t *abstract_surface, } static const cairo_boilerplate_target_t targets[] = { +#if CAIRO_CAN_TEST_SVG_SURFACE /* It seems we should be able to round-trip SVG content perfectly * through librsvg and cairo, but for some mysterious reason, some * systems get an error of 1 for some pixels on some of the text @@ -319,5 +320,6 @@ static const cairo_boilerplate_target_t targets[] = { _cairo_boilerplate_svg_cleanup, NULL, TRUE, TRUE }, +#endif }; CAIRO_BOILERPLATE (svg, targets) |