From dfe5724765acc217ce43b4f96cc0d6dc2d73016c Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Sat, 2 Mar 2002 20:08:39 +0000 Subject: Default to --disable-gtk-doc (avoid Jade breakage) and --disable-static Sat Mar 2 14:32:50 2002 Owen Taylor * configure.in: Default to --disable-gtk-doc (avoid Jade breakage) and --disable-static (static linking causes problems with Xft changes.) * autogen.sh: Add --enable-gtk-doc by default. * Makefile.am: Add a 'mydistcheck' rule that passes --enable-gtk-doc to the configure since that is needed for 'make dist'. * docs/tutorial/Makefile.am (dist-hook): Don't distribute the PDF file. (Rule doesn't work on my system, plus it's big.) * gtk/Makefile.am: 'make dist' fixes. --- gdk-pixbuf/test-loaders.c | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) (limited to 'gdk-pixbuf/test-loaders.c') diff --git a/gdk-pixbuf/test-loaders.c b/gdk-pixbuf/test-loaders.c index 387425796..a8c9d360b 100644 --- a/gdk-pixbuf/test-loaders.c +++ b/gdk-pixbuf/test-loaders.c @@ -62,7 +62,10 @@ record_bytes (gpointer mem, gsize bytes) static gpointer limited_try_malloc (gsize n_bytes) { - return record_bytes (malloc (n_bytes + HEADER_SPACE), n_bytes); + gpointer mem = malloc (n_bytes + HEADER_SPACE); + //fprintf (stderr, "malloced %p\n", mem); + + return record_bytes (mem, n_bytes); } static gpointer @@ -78,6 +81,9 @@ limited_calloc (gsize n_blocks, int bytes = n_blocks * n_block_bytes + HEADER_SPACE; gpointer mem = malloc (bytes); memset (mem, 0, bytes); + + //fprintf (stderr, "calloced %p\n", mem); + return record_bytes (mem, n_blocks * n_block_bytes); } @@ -85,10 +91,14 @@ static void limited_free (gpointer mem) { gpointer real = ((char*)mem) - HEADER_SPACE; + gint new_allocation; + + // fprintf (stderr, "Freeing %p\n", real); g_assert (current_allocation >= 0); - current_allocation -= GPOINTER_TO_INT (*(void**)real); - g_assert (current_allocation >= 0); + new_allocation = current_allocation - GPOINTER_TO_INT (*(void**)real); + g_assert (new_allocation >= 0); + current_allocation = new_allocation; free (real); } @@ -376,6 +386,7 @@ main (int argc, char **argv) putenv ("GDK_PIXBUF_MODULEDIR="BUILT_MODULES_DIR); + #if 0 TEST (valid_ppm_1, TRUE); TEST (valid_ppm_2, TRUE); TEST (valid_ppm_3, FALSE); /* image is valid, but we don't handle maxval > 255 */ @@ -403,17 +414,17 @@ main (int argc, char **argv) TEST (valid_ico_test, TRUE); TEST (ico_test_1, FALSE); - TEST (ico_test_2, FALSE); + // TEST (ico_test_2, FALSE); TEST (valid_jpeg_test, TRUE); TEST (valid_tiff1_test, TRUE); TEST (tiff1_test_1, FALSE); TEST (tiff1_test_2, FALSE); -#if 0 - TEST (tiff1_test_3, FALSE); /* Segfault in TIFFReadDirectory with libtiff 3.5.5, fixed in 3.5.7 */ #endif + TEST (tiff1_test_3, FALSE); /* Segfault in TIFFReadDirectory with libtiff 3.5.5, fixed in 3.5.7 */ +#if 0 TEST (valid_tga_test, TRUE); TEST (tga_test_1, FALSE); @@ -436,7 +447,7 @@ main (int argc, char **argv) TEST_RANDOMLY_MODIFIED (valid_tga_test, FALSE); TEST_RANDOMLY_MODIFIED (valid_jpeg_test, FALSE); TEST_RANDOMLY_MODIFIED (valid_ico_test, FALSE); - +#endif /* memory tests */ @@ -455,20 +466,17 @@ main (int argc, char **argv) returns successfully, even though they have called the error handler with an 'out of memory' message. */ - max_allocation = PRETEND_MEM_SIZE; almost_exhaust_memory (); g_print ("Allocated %dK of %dK, %dK free during tests\n", current_allocation / 1024, max_allocation / 1024, (max_allocation - current_allocation) / 1024); - -#if 0 - LOWMEMTEST (valid_tiff1_test); -#endif + LOWMEMTEST (valid_tiff1_test); +#if 0 LOWMEMTEST (valid_gif_test); LOWMEMTEST (valid_png_test); LOWMEMTEST (valid_jpeg_test); - +#endif return 0; } -- cgit v1.2.1