mirror of
https://gitlab.freedesktop.org/cairo/cairo.git
synced 2026-06-19 05:28:34 +02:00
[test] Memfault checks.
Don't assume an error means the test failed, check for injected allocation errors.
This commit is contained in:
Chris Wilson
parent
ea6197c2f5
commit
aee71e2063
1 changed files with 113 additions and 51 deletions
|
|
@ -54,13 +54,19 @@ draw (cairo_t *cr, int width, int height)
|
|||
|
||||
surface = cairo_image_surface_create_from_png (filename);
|
||||
if (cairo_surface_status (surface)) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
cairo_test_status_t result;
|
||||
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
|
||||
free (filename);
|
||||
return CAIRO_TEST_FAILURE;
|
||||
return result;
|
||||
}
|
||||
free (filename);
|
||||
|
||||
cairo_set_source_surface (cr, surface, 0, 0);
|
||||
cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
|
||||
|
|
@ -68,6 +74,7 @@ draw (cairo_t *cr, int width, int height)
|
|||
|
||||
cairo_surface_destroy (surface);
|
||||
|
||||
free (filename);
|
||||
return CAIRO_TEST_SUCCESS;
|
||||
}
|
||||
|
||||
|
|
@ -81,27 +88,42 @@ preamble (cairo_test_context_t *ctx)
|
|||
|
||||
surface = cairo_image_surface_create_from_png ("___THIS_FILE_DOES_NOT_EXIST___");
|
||||
if (cairo_surface_status (surface) != CAIRO_STATUS_FILE_NOT_FOUND) {
|
||||
cairo_test_log (ctx, "Error: expected \"file not found\", but got: %s\n",
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error: expected \"file not found\", but got: %s\n",
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
}
|
||||
cairo_surface_destroy (surface);
|
||||
if (result != CAIRO_TEST_SUCCESS)
|
||||
return result;
|
||||
|
||||
surface = cairo_image_surface_create_from_png_stream (no_memory_error, NULL);
|
||||
if (cairo_surface_status (surface) != CAIRO_STATUS_NO_MEMORY) {
|
||||
cairo_test_log (ctx, "Error: expected \"out of memory\", but got: %s\n",
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error: expected \"out of memory\", but got: %s\n",
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
}
|
||||
cairo_surface_destroy (surface);
|
||||
if (result != CAIRO_TEST_SUCCESS)
|
||||
return result;
|
||||
|
||||
surface = cairo_image_surface_create_from_png_stream (read_error, NULL);
|
||||
if (cairo_surface_status (surface) != CAIRO_STATUS_READ_ERROR) {
|
||||
cairo_test_log (ctx, "Error: expected \"read error\", but got: %s\n",
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error: expected \"read error\", but got: %s\n",
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
}
|
||||
cairo_surface_destroy (surface);
|
||||
if (result != CAIRO_TEST_SUCCESS)
|
||||
return result;
|
||||
|
||||
/* cheekily test error propagation from the user write funcs as well ... */
|
||||
xasprintf (&filename, "%s/%s", ctx->srcdir,
|
||||
|
|
@ -109,48 +131,63 @@ preamble (cairo_test_context_t *ctx)
|
|||
|
||||
surface = cairo_image_surface_create_from_png (filename);
|
||||
if (cairo_surface_status (surface)) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
} else {
|
||||
status = cairo_surface_write_to_png_stream (surface,
|
||||
(cairo_write_func_t) no_memory_error,
|
||||
NULL);
|
||||
if (status != CAIRO_STATUS_NO_MEMORY) {
|
||||
cairo_test_log (ctx, "Error: expected \"out of memory\", but got: %s\n",
|
||||
cairo_status_to_string (status));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx, status);
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error: expected \"out of memory\", but got: %s\n",
|
||||
cairo_status_to_string (status));
|
||||
}
|
||||
}
|
||||
|
||||
status = cairo_surface_write_to_png_stream (surface,
|
||||
(cairo_write_func_t) read_error,
|
||||
NULL);
|
||||
if (status != CAIRO_STATUS_READ_ERROR) {
|
||||
cairo_test_log (ctx, "Error: expected \"read error\", but got: %s\n",
|
||||
cairo_status_to_string (status));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx, status);
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error: expected \"read error\", but got: %s\n",
|
||||
cairo_status_to_string (status));
|
||||
}
|
||||
}
|
||||
|
||||
/* and check that error has not propagated to the surface */
|
||||
if (cairo_surface_status (surface)) {
|
||||
cairo_test_log (ctx, "Error: user write error propagated to surface: %s",
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error: user write error propagated to surface: %s",
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
}
|
||||
}
|
||||
cairo_surface_destroy (surface);
|
||||
free (filename);
|
||||
if (result != CAIRO_TEST_SUCCESS)
|
||||
return result;
|
||||
|
||||
/* check that loading alpha/opaque PNGs generate the correct surfaces */
|
||||
xasprintf (&filename, "%s/%s", ctx->srcdir,
|
||||
"create-from-png.alpha.ref.png");
|
||||
surface = cairo_image_surface_create_from_png (filename);
|
||||
if (cairo_surface_status (surface)) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
} else if (cairo_image_surface_get_format (surface) != CAIRO_FORMAT_ARGB32) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: did not create an ARGB32 image\n",
|
||||
filename);
|
||||
|
|
@ -158,15 +195,20 @@ preamble (cairo_test_context_t *ctx)
|
|||
}
|
||||
free (filename);
|
||||
cairo_surface_destroy (surface);
|
||||
if (result != CAIRO_TEST_SUCCESS)
|
||||
return result;
|
||||
|
||||
xasprintf (&filename, "%s/%s", ctx->srcdir,
|
||||
"create-from-png.ref.png");
|
||||
surface = cairo_image_surface_create_from_png (filename);
|
||||
if (cairo_surface_status (surface)) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
} else if (cairo_image_surface_get_format (surface) != CAIRO_FORMAT_RGB24) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: did not create an RGB24 image\n",
|
||||
filename);
|
||||
|
|
@ -174,16 +216,21 @@ preamble (cairo_test_context_t *ctx)
|
|||
}
|
||||
free (filename);
|
||||
cairo_surface_destroy (surface);
|
||||
if (result != CAIRO_TEST_SUCCESS)
|
||||
return result;
|
||||
|
||||
/* check paletted PNGs */
|
||||
xasprintf (&filename, "%s/%s", ctx->srcdir,
|
||||
"create-from-png.indexed-alpha.ref.png");
|
||||
surface = cairo_image_surface_create_from_png (filename);
|
||||
if (cairo_surface_status (surface)) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
} else if (cairo_image_surface_get_format (surface) != CAIRO_FORMAT_ARGB32) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: did not create an ARGB32 image\n",
|
||||
filename);
|
||||
|
|
@ -191,15 +238,20 @@ preamble (cairo_test_context_t *ctx)
|
|||
}
|
||||
free (filename);
|
||||
cairo_surface_destroy (surface);
|
||||
if (result != CAIRO_TEST_SUCCESS)
|
||||
return result;
|
||||
|
||||
xasprintf (&filename, "%s/%s", ctx->srcdir,
|
||||
"create-from-png.indexed.ref.png");
|
||||
surface = cairo_image_surface_create_from_png (filename);
|
||||
if (cairo_surface_status (surface)) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
} else if (cairo_image_surface_get_format (surface) != CAIRO_FORMAT_RGB24) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: did not create an RGB24 image\n",
|
||||
filename);
|
||||
|
|
@ -207,16 +259,21 @@ preamble (cairo_test_context_t *ctx)
|
|||
}
|
||||
free (filename);
|
||||
cairo_surface_destroy (surface);
|
||||
if (result != CAIRO_TEST_SUCCESS)
|
||||
return result;
|
||||
|
||||
/* check grayscale PNGs */
|
||||
xasprintf (&filename, "%s/%s", ctx->srcdir,
|
||||
"create-from-png.gray-alpha.ref.png");
|
||||
surface = cairo_image_surface_create_from_png (filename);
|
||||
if (cairo_surface_status (surface)) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
} else if (cairo_image_surface_get_format (surface) != CAIRO_FORMAT_ARGB32) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: did not create an ARGB32 image\n",
|
||||
filename);
|
||||
|
|
@ -224,15 +281,20 @@ preamble (cairo_test_context_t *ctx)
|
|||
}
|
||||
free (filename);
|
||||
cairo_surface_destroy (surface);
|
||||
if (result != CAIRO_TEST_SUCCESS)
|
||||
return result;
|
||||
|
||||
xasprintf (&filename, "%s/%s", ctx->srcdir,
|
||||
"create-from-png.gray.ref.png");
|
||||
surface = cairo_image_surface_create_from_png (filename);
|
||||
if (cairo_surface_status (surface)) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
result = CAIRO_TEST_FAILURE;
|
||||
result = cairo_test_status_from_status (ctx,
|
||||
cairo_surface_status (surface));
|
||||
if (result == CAIRO_TEST_FAILURE) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: %s\n",
|
||||
filename,
|
||||
cairo_status_to_string (cairo_surface_status (surface)));
|
||||
}
|
||||
} else if (cairo_image_surface_get_format (surface) != CAIRO_FORMAT_RGB24) {
|
||||
cairo_test_log (ctx, "Error reading PNG image %s: did not create an RGB24 image\n",
|
||||
filename);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue