diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2008-08-11 21:12:45 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2008-08-13 21:54:59 +0100 |
commit | 436c0c8be28546813139f391a62303d4c1894fc3 (patch) | |
tree | 7134b42ba4af4da886f8bd7906f4d6a144d1a134 /test/multi-page.c | |
parent | c73b3e43e120065e40d8fc48c9bdbd88ebe8ab40 (diff) |
[test] Preparatory work for running under memfault.
In order to run under memfault, the framework is first extended to handle
running concurrent tests - i.e. multi-threading. (Not that this is a
requirement for memfault, instead it shares a common goal of storing
per-test data). To that end all the global data is moved into a per-test
context and the targets are adjusted to avoid overlap on shared, global
resources (such as output files and frame buffers). In order to preserve
the simplicity of the standard draw routines, the context is not passed
explicitly as a parameter to the routines, but is instead attached to the
cairo_t via the user_data.
For the masochist, to enable the tests to be run across multiple threads
simply set the environment variable CAIRO_TEST_NUM_THREADS to the desired
number.
In the long run, we can hope the need for memfault (runtime testing of
error paths) will be mitigated by static analysis. A promising candidate
for this task would appear to be http://hal.cs.berkeley.edu/cil/.
Diffstat (limited to 'test/multi-page.c')
-rw-r--r-- | test/multi-page.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/test/multi-page.c b/test/multi-page.c index f0265e25..4e0749af 100644 --- a/test/multi-page.c +++ b/test/multi-page.c @@ -130,11 +130,13 @@ draw_some_pages (cairo_surface_t *surface) int main (void) { + cairo_test_context_t ctx; cairo_surface_t *surface; cairo_status_t status; const char *filename; + cairo_test_status_t result = CAIRO_TEST_SUCCESS; - cairo_test_init ("multi-page"); + cairo_test_init (&ctx, "multi-page"); #if CAIRO_HAS_PS_SURFACE filename = "multi-page.ps"; @@ -143,9 +145,9 @@ main (void) WIDTH_IN_POINTS, HEIGHT_IN_POINTS); status = cairo_surface_status (surface); if (status) { - cairo_test_log ("Failed to create ps surface for file %s: %s\n", + cairo_test_log (&ctx, "Failed to create ps surface for file %s: %s\n", filename, cairo_status_to_string (status)); - return CAIRO_TEST_FAILURE; + result = CAIRO_TEST_FAILURE; } draw_some_pages (surface); @@ -162,9 +164,9 @@ main (void) WIDTH_IN_POINTS, HEIGHT_IN_POINTS); status = cairo_surface_status (surface); if (status) { - cairo_test_log ("Failed to create pdf surface for file %s: %s\n", + cairo_test_log (&ctx, "Failed to create pdf surface for file %s: %s\n", filename, cairo_status_to_string (status)); - return CAIRO_TEST_FAILURE; + result = CAIRO_TEST_FAILURE; } draw_some_pages (surface); @@ -174,7 +176,7 @@ main (void) printf ("multi-page: Please check %s to ensure it looks happy.\n", filename); #endif - cairo_test_fini (); + cairo_test_fini (&ctx); - return CAIRO_TEST_SUCCESS; + return result; } |