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/buffer-diff.h | |
| 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/buffer-diff.h')
| -rw-r--r-- | test/buffer-diff.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/buffer-diff.h b/test/buffer-diff.h index cd3534508..61daa897d 100644 --- a/test/buffer-diff.h +++ b/test/buffer-diff.h @@ -45,7 +45,8 @@ typedef struct _buffer_diff_result { * images differ. */ void -compare_surfaces (cairo_surface_t *surface_a, +compare_surfaces (const cairo_test_context_t *ctx, + cairo_surface_t *surface_a, cairo_surface_t *surface_b, cairo_surface_t *surface_diff, buffer_diff_result_t *result); @@ -81,7 +82,8 @@ buffer_diff_noalpha (unsigned char *buf_a, * images differ. */ cairo_status_t -image_diff (const char *filename_a, +image_diff (const cairo_test_context_t *ctx, + const char *filename_a, const char *filename_b, const char *filename_diff, int ax, @@ -92,7 +94,8 @@ image_diff (const char *filename_a, /* Like image_diff, but blending the contents of b over white first. */ cairo_status_t -image_diff_flattened (const char *filename_a, +image_diff_flattened (const cairo_test_context_t *ctx, + const char *filename_a, const char *filename_b, const char *filename_diff, int ax, |