[glib] Disable deprecations where appropriate in tests

[Matthias Clasen <matthiasc src gnome org>]

commit daede1dc27bbf28d2cbefc2fac22e0f917a23952
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Oct 12 00:37:02 2011 -0400

    Disable deprecations where appropriate in tests

 glib/tests/unix.c                   |    4 ----
 gobject/tests/boxed.c               |    2 ++
 gobject/tests/dynamictests.c        |    3 +--
 gobject/tests/param.c               |    1 +
 gobject/tests/threadtests.c         |    2 +-
 gthread/tests/1bit-mutex.c          |    4 +---
 gthread/tests/642026.c              |    8 ++------
 gthread/tests/atomic.c              |    4 +---
 gthread/tests/gwakeuptest.c         |    4 +---
 gthread/tests/spawn-multithreaded.c |    6 ++----
 gthread/tests/spawn-singlethread.c  |    2 --
 11 files changed, 12 insertions(+), 28 deletions(-)
---
diff --git a/glib/tests/unix.c b/glib/tests/unix.c
index 061b5a6..eb81c7a 100644
--- a/glib/tests/unix.c
+++ b/glib/tests/unix.c
@@ -147,10 +147,6 @@ main (int   argc,
 {
   g_test_init (&argc, &argv, NULL);
 
-#ifdef TEST_THREADED
-  g_thread_init (NULL);
-#endif
-
   g_test_add_func ("/glib-unix/pipe", test_pipe);
   g_test_add_func ("/glib-unix/error", test_error);
   g_test_add_func ("/glib-unix/sighup", test_sighup);
diff --git a/gobject/tests/boxed.c b/gobject/tests/boxed.c
index a2c8d60..421a437 100644
--- a/gobject/tests/boxed.c
+++ b/gobject/tests/boxed.c
@@ -1,3 +1,5 @@
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include <glib-object.h>
 
 typedef struct _MyBoxed MyBoxed;
diff --git a/gobject/tests/dynamictests.c b/gobject/tests/dynamictests.c
index a72ad89..16fc925 100644
--- a/gobject/tests/dynamictests.c
+++ b/gobject/tests/dynamictests.c
@@ -210,7 +210,7 @@ test_multithreaded_dynamic_type_init (void)
 
   /* create threads */
   for (i = 0; i < N_THREADS; i++) {
-    threads[i] = g_thread_create (ref_unref_thread, (gpointer) DYNAMIC_OBJECT_TYPE, TRUE, NULL);
+    threads[i] = g_thread_new ("test", ref_unref_thread, (gpointer) DYNAMIC_OBJECT_TYPE, TRUE, NULL);
   }
 
   /* execute threads */
@@ -352,7 +352,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_thread_init (NULL);
   g_test_init (&argc, &argv, NULL);
   g_type_init ();
 
diff --git a/gobject/tests/param.c b/gobject/tests/param.c
index d06bd51..5c3dab1 100644
--- a/gobject/tests/param.c
+++ b/gobject/tests/param.c
@@ -1,3 +1,4 @@
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <glib-object.h>
 
 static void
diff --git a/gobject/tests/threadtests.c b/gobject/tests/threadtests.c
index 1352932..91bb443 100644
--- a/gobject/tests/threadtests.c
+++ b/gobject/tests/threadtests.c
@@ -19,6 +19,7 @@
  * otherwise) arising in any way out of the use of this software, even
  * if advised of the possibility of such damage.
  */
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
 #include <glib.h>
 #include <glib-object.h>
 
@@ -200,7 +201,6 @@ int
 main (int   argc,
       char *argv[])
 {
-  g_thread_init (NULL);
   g_test_init (&argc, &argv, NULL);
   g_type_init ();
 
diff --git a/gthread/tests/1bit-mutex.c b/gthread/tests/1bit-mutex.c
index c537756..8d98b0e 100644
--- a/gthread/tests/1bit-mutex.c
+++ b/gthread/tests/1bit-mutex.c
@@ -117,8 +117,6 @@ testcase (gconstpointer data)
   GThread *threads[THREADS];
   int i;
 
-  g_thread_init (NULL);
-
 #ifdef TEST_EMULATED_FUTEX
   #define SUFFIX "-emufutex"
 
@@ -134,7 +132,7 @@ testcase (gconstpointer data)
     bits[i] = g_random_int () % 32;
 
   for (i = 0; i < THREADS; i++)
-    threads[i] = g_thread_create (thread_func,
+    threads[i] = g_thread_new ("foo", thread_func,
                                   GINT_TO_POINTER (use_pointers),
                                   TRUE, NULL);
 
diff --git a/gthread/tests/642026.c b/gthread/tests/642026.c
index a95623d..4764680 100644
--- a/gthread/tests/642026.c
+++ b/gthread/tests/642026.c
@@ -10,6 +10,8 @@
  * See the included COPYING file for more information.
  */
 
+#define GLIB_DISABLE_DEPRECATION_WARNINGS
+
 #include <glib.h>
 
 /* On smcv's laptop, 1e4 iterations didn't always exhibit the bug, but 1e5
@@ -49,8 +51,6 @@ testcase (void)
 {
   g_test_bug ("642026");
 
-  g_thread_init (NULL);
-
   mutex = g_mutex_new ();
   cond = g_cond_new ();
 
@@ -85,11 +85,7 @@ main (int argc,
   g_test_init (&argc, &argv, NULL);
   g_test_bug_base ("https://bugzilla.gnome.org/show_bug.cgi?id=";);
 
-#ifdef G_ERRORCHECK_MUTEXES
-  g_test_add_func ("/glib/642026-ec", testcase);
-#else
   g_test_add_func ("/glib/642026", testcase);
-#endif
 
   return g_test_run ();
 }
diff --git a/gthread/tests/atomic.c b/gthread/tests/atomic.c
index c5c1c78..12f72a0 100644
--- a/gthread/tests/atomic.c
+++ b/gthread/tests/atomic.c
@@ -47,7 +47,7 @@ test_atomic (void)
     bucket[i] = 0;
 
   for (i = 0; i < THREADS; i++)
-    threads[i] = g_thread_create (thread_func, GINT_TO_POINTER (i), TRUE, NULL);
+    threads[i] = g_thread_new ("atomic", thread_func, GINT_TO_POINTER (i), TRUE, NULL);
 
   for (i = 0; i < THREADS; i++)
     g_thread_join (threads[i]);
@@ -62,8 +62,6 @@ test_atomic (void)
 int
 main (int argc, char *argv[])
 {
-  g_thread_init (NULL);
-
   g_test_init (&argc, &argv, NULL);
 
   g_test_add_func ("/glib/atomic/add", test_atomic);
diff --git a/gthread/tests/gwakeuptest.c b/gthread/tests/gwakeuptest.c
index 097441e..3da5753 100644
--- a/gthread/tests/gwakeuptest.c
+++ b/gthread/tests/gwakeuptest.c
@@ -229,7 +229,7 @@ test_threaded (void)
   for (i = 0; i < NUM_THREADS; i++)
     {
       context_init (&contexts[i]);
-      threads[i] = g_thread_create (thread_func, &contexts[i], TRUE, NULL);
+      threads[i] = g_thread_new ("test", thread_func, &contexts[i], TRUE, NULL);
     }
 
   /* dispatch tokens */
@@ -256,8 +256,6 @@ test_threaded (void)
 int
 main (int argc, char **argv)
 {
-  g_thread_init (NULL);
-
   g_test_init (&argc, &argv, NULL);
 
 #ifdef TEST_EVENTFD_FALLBACK
diff --git a/gthread/tests/spawn-multithreaded.c b/gthread/tests/spawn-multithreaded.c
index 1eaf4e3..119012f 100644
--- a/gthread/tests/spawn-multithreaded.c
+++ b/gthread/tests/spawn-multithreaded.c
@@ -41,8 +41,8 @@ multithreaded_test_run (GThreadFunc function)
     {
       GThread *thread;
 
-      thread = g_thread_create (function,
-				GINT_TO_POINTER (i), TRUE, &error);
+      thread = g_thread_new ("test", function,
+                             GINT_TO_POINTER (i), TRUE, &error);
       g_assert_no_error (error);
       g_ptr_array_add (threads, thread);
     }
@@ -221,8 +221,6 @@ main (int   argc,
 
   g_test_init (&argc, &argv, NULL);
 
-  g_thread_init (NULL);
-
   dirname = g_path_get_dirname (argv[0]);
   echo_prog_path = g_build_filename (dirname, "test-spawn-echo", NULL);
   if (!g_file_test (echo_prog_path, G_FILE_TEST_EXISTS))
diff --git a/gthread/tests/spawn-singlethread.c b/gthread/tests/spawn-singlethread.c
index 777a8f9..f29ecb8 100644
--- a/gthread/tests/spawn-singlethread.c
+++ b/gthread/tests/spawn-singlethread.c
@@ -172,8 +172,6 @@ main (int   argc,
 
   g_test_init (&argc, &argv, NULL);
 
-  g_thread_init (NULL);
-
   dirname = g_path_get_dirname (argv[0]);
   echo_prog_path = g_build_filename (dirname, "test-spawn-echo", NULL);
   if (!g_file_test (echo_prog_path, G_FILE_TEST_EXISTS))