More tightening of test cleanup to avoid valgrind complaints.

This commit is contained in:
Carl Worth 2007-03-02 12:30:14 -08:00
parent 9854d01a8d
commit 8c579ef835
6 changed files with 11 additions and 27 deletions

View file

@ -108,6 +108,10 @@ void
cairo_test_fini (void)
{
fclose (cairo_test_log_file);
cairo_debug_reset_static_data ();
#if HAVE_FCFINI
FcFini ();
#endif
}
void
@ -562,10 +566,6 @@ cairo_test_expecting (cairo_test_t *test,
free (targets_to_test);
#if HAVE_FCFINI
FcFini ();
#endif
return ret;
}

View file

@ -145,5 +145,7 @@ main (void)
backend_filename[backend]);
}
cairo_test_fini ();
return CAIRO_TEST_SUCCESS;
}

View file

@ -66,5 +66,7 @@ main (void)
cairo_destroy (cr);
cairo_surface_destroy (surface);
cairo_test_fini ();
return CAIRO_TEST_SUCCESS;
}

View file

@ -26,9 +26,6 @@
#include <stdio.h>
#include <cairo.h>
#include <cairo-pdf.h>
#if HAVE_FCFINI
#include <fontconfig/fontconfig.h>
#endif
#include "cairo-test.h"
@ -140,11 +137,7 @@ main (void)
printf ("pdf-features: Please check %s to ensure it looks/prints correctly.\n", filename);
cairo_debug_reset_static_data ();
#if HAVE_FCFINI
FcFini ();
#endif
cairo_test_fini ();
return CAIRO_TEST_SUCCESS;
}

View file

@ -26,9 +26,6 @@
#include <stdio.h>
#include <cairo.h>
#include <cairo-ps.h>
#if HAVE_FCFINI
#include <fontconfig/fontconfig.h>
#endif
#include "cairo-test.h"
@ -154,11 +151,7 @@ main (void)
printf ("ps-features: Please check %s to ensure it looks/prints correctly.\n", filename);
cairo_debug_reset_static_data ();
#if HAVE_FCFINI
FcFini ();
#endif
cairo_test_fini ();
return CAIRO_TEST_SUCCESS;
}

View file

@ -35,9 +35,6 @@
#include <string.h>
#include <stdlib.h>
#include <pthread.h>
#if HAVE_FCFINI
#include <fontconfig/fontconfig.h>
#endif
#define NUM_THREADS_DEFAULT 50
#define NUM_ITERATIONS 50
@ -107,10 +104,7 @@ main (int argc, char *argv[])
free (pthread);
cairo_debug_reset_static_data ();
#if HAVE_FCFINI
FcFini ();
#endif
cairo_test_fini ();
return CAIRO_TEST_SUCCESS;
}