Bug 547337 – G_DISABLE_DEPRECATED breaks tests build

2008-08-13  Matthias Clasen  <mclasen@redhat.com>

        Bug 547337 – G_DISABLE_DEPRECATED breaks tests build

        * tests/testglib.c: Protect deprecated API by ifdefs.
        Patch by Kalle Vahlman

svn path=/trunk/; revision=7353

diff --git a/ChangeLog b/ChangeLog
index 0c9f0bc..5835b6a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2008-08-13  Matthias Clasen  <mclasen@redhat.com>
 
+       Bug 547337 – G_DISABLE_DEPRECATED breaks tests build
+
+       * tests/testglib.c: Protect deprecated API by ifdefs.
+       Patch by Kalle Vahlman
+
+2008-08-13  Matthias Clasen  <mclasen@redhat.com>
+
        Bug 547637 – unconditional #include of sys/statfs.h in configure
        impedes detection of statfs things if non-existant
 

diff --git a/tests/testglib.c b/tests/testglib.c
index 075460b..8d3a59c 100644 (file)
--- a/tests/testglib.c
+++ b/tests/testglib.c
@@ -1486,6 +1486,7 @@ various_string_tests (void)
   /* g_debug (argv[0]); */
 }
 
+#ifndef G_DISABLE_DEPRECATED
 static void
 test_mem_chunks (void)
 {
@@ -1502,6 +1503,7 @@ test_mem_chunks (void)
   for (i = 0; i < 10000; i++)
     g_mem_chunk_free (mem_chunk, mem[i]);
 }
+#endif
 
 int
 main (int   argc,
@@ -1523,7 +1525,9 @@ main (int   argc,
   g_test_add_func ("/testglib/File Paths", test_paths);
   g_test_add_func ("/testglib/File Functions", test_file_functions);
   g_test_add_func ("/testglib/Parse Debug Strings", test_g_parse_debug_string);
+#ifndef G_DISABLE_DEPRECATED
   g_test_add_func ("/testglib/GMemChunk (deprecated)", test_mem_chunks);
+#endif
   g_test_add_func ("/testglib/Warnings & Errors", log_warning_error_tests);
   g_test_add_func ("/testglib/Timers (slow)", timer_tests);