fdo-mirrors/cairo
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/cairo/cairo.git synced 2026-05-04 23:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

[test] Suppress suppressed memfault report

Browse source 
Check to see if there are any *unsuppressed* memfaults before declaring
unreported faults.
This commit is contained in:
Chris Wilson 2009-01-29 09:49:41 +00:00
parent 8dc4c0da9b
commit 3752f690b4
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
test/cairo-test.c
View file

@ -762,8 +762,12 @@ REPEAT:
goto UNWIND_STRINGS;
}
if (cairo_test_malloc_failure (ctx, cairo_surface_status (surface)))
if (ctx->malloc_failure &&
VALGRIND_COUNT_FAULTS () - last_fault_count > 0 &&
cairo_surface_status (surface) == CAIRO_STATUS_NO_MEMORY)
{
goto REPEAT;
}
if (cairo_surface_status (surface)) {
MF (VALGRIND_PRINT_FAULTS ());
@ -885,7 +889,9 @@ REPEAT:
}
#if HAVE_MEMFAULT
if (VALGRIND_COUNT_FAULTS () - last_fault_count > 0) {
if (VALGRIND_COUNT_FAULTS () - last_fault_count > 0 &&
VALGRIND_HAS_FAULTS ())
{
VALGRIND_PRINTF ("Unreported memfaults...");
VALGRIND_PRINT_FAULTS ();
}
@ -1494,6 +1500,7 @@ cairo_test_create_surface_from_png (const cairo_test_context_t *ctx,
if (ctx->srcdir) {
char *srcdir_filename;
xasprintf (&srcdir_filename, "%s/%s", ctx->srcdir, filename);
cairo_surface_destroy (image);
image = cairo_image_surface_create_from_png (srcdir_filename);
free (srcdir_filename);
}