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/font-face-get-type.c | |
parent | c73b3e43e120065e40d8fc48c9bdbd88ebe8ab40 (diff) | |
download | cairo-436c0c8be28546813139f391a62303d4c1894fc3.tar.gz |
[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/font-face-get-type.c')
-rw-r--r-- | test/font-face-get-type.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/test/font-face-get-type.c b/test/font-face-get-type.c index a3298fa45..32ebc47c2 100644 --- a/test/font-face-get-type.c +++ b/test/font-face-get-type.c @@ -28,14 +28,15 @@ int main (void) { + cairo_test_context_t ctx; cairo_surface_t *surface; cairo_t *cr; cairo_font_face_t *font_face; cairo_scaled_font_t *scaled_font; - cairo_test_init ("font-face-get-type"); + cairo_test_init (&ctx, "font-face-get-type"); - cairo_test_log ("Creating cairo context and obtaining a font face\n"); + cairo_test_log (&ctx, "Creating cairo context and obtaining a font face\n"); surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, 1, 1); cr = cairo_create (surface); @@ -44,29 +45,31 @@ main (void) CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); - cairo_test_log ("Testing return value of cairo_font_face_get_type\n"); + cairo_test_log (&ctx, "Testing return value of cairo_font_face_get_type\n"); font_face = cairo_get_font_face (cr); if (cairo_font_face_get_type (font_face) != CAIRO_FONT_TYPE_TOY) { - cairo_test_log ("Unexpected value %d from cairo_font_face_get_type (expected %d)\n", + cairo_test_log (&ctx, "Unexpected value %d from cairo_font_face_get_type (expected %d)\n", cairo_font_face_get_type (font_face), CAIRO_FONT_TYPE_TOY); + cairo_test_fini (&ctx); return CAIRO_TEST_FAILURE; } - cairo_test_log ("Testing return value of cairo_get_scaled_font\n"); + cairo_test_log (&ctx, "Testing return value of cairo_get_scaled_font\n"); scaled_font = cairo_get_scaled_font (cr); if (cairo_scaled_font_get_font_face (scaled_font) != font_face) { - cairo_test_log ("Font face returned from the scaled font is different from that returned by the context\n"); + cairo_test_log (&ctx, "Font face returned from the scaled font is different from that returned by the context\n"); + cairo_test_fini (&ctx); return CAIRO_TEST_FAILURE; } cairo_destroy (cr); cairo_surface_destroy (surface); - cairo_test_fini (); + cairo_test_fini (&ctx); return CAIRO_TEST_SUCCESS; } |