[cairo-commit] cairo/test cairo-test.c, 1.48, 1.49 text-cache-crash.c, 1.8, 1.9

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/test
In directory gabe:/tmp/cvs-serv21598/test

Modified Files:
	cairo-test.c text-cache-crash.c 
Log Message:

2005-08-03  Carl Worth  <cworth at cworth.org>

        Fix for bug #3951:

        * configure.in: Add new _CHECK_FUNCS_WITH_FLAGS to abstract out
        the pain of temporarily setting flags for AC_CHECK_FUNCS. Use this
        to check for the existence of FcFini.

        * test/cairo-test.c: (cairo_test_expecting): Make call to FcFini
        conditional on HAVE_FCFINI.

        * test/text-cache-crash.c: (main): Remove stale comment about
        cleaning up memory which is now handled by cairo-test.c.


Index: cairo-test.c
===================================================================
RCS file: /cvs/cairo/cairo/test/cairo-test.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- cairo-test.c	1 Aug 2005 20:33:47 -0000	1.48
+++ cairo-test.c	3 Aug 2005 17:32:50 -0000	1.49
@@ -561,7 +561,9 @@
 
     fclose (cairo_test_log_file);
 
+#if HAVE_FCFINI
     FcFini ();
+#endif
 
     return ret;
 }

Index: text-cache-crash.c
===================================================================
RCS file: /cvs/cairo/cairo/test/text-cache-crash.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- text-cache-crash.c	6 May 2005 20:32:53 -0000	1.8
+++ text-cache-crash.c	3 Aug 2005 17:32:50 -0000	1.9
@@ -118,20 +118,6 @@
 
     ret = cairo_test (&test, draw);
 
-    /* It's convenient to be able to free all memory (including
-     * statically allocated memory). This makes it quite easy to use
-     * tools such as valgrind to verify that there are no memory leaks
-     * whatsoever.
-     *
-     * But I'm not sure what would be a sensible cairo API function
-     * for this. The cairo_destroy_caches call below is just something
-     * I made as a local modification to cairo.
-     */
-    /*
-    cairo_destroy_caches ();
-    FcFini ();
-    */
-
     return ret;
 }