Stop using GStaticMutex in two testcases

[platform/upstream/glib.git] / tests / thread-test.c

diff --git a/tests/thread-test.c b/tests/thread-test.c
index 47b030b..fa4f02b 100644 (file)
--- a/tests/thread-test.c
+++ b/tests/thread-test.c
@@ -110,25 +110,25 @@ test_g_static_rec_mutex (void)
 
 static GStaticPrivate test_g_static_private_private1 = G_STATIC_PRIVATE_INIT;
 static GStaticPrivate test_g_static_private_private2 = G_STATIC_PRIVATE_INIT;
-static GStaticMutex test_g_static_private_mutex = G_STATIC_MUTEX_INIT;
+static GMutex test_g_static_private_mutex = G_MUTEX_INIT;
 static guint test_g_static_private_counter = 0;
 static guint test_g_static_private_ready = 0;
 
 static gpointer
 test_g_static_private_constructor (void)
 {
-  g_static_mutex_lock (&test_g_static_private_mutex);
+  g_mutex_lock (&test_g_static_private_mutex);
   test_g_static_private_counter++;
-  g_static_mutex_unlock (&test_g_static_private_mutex);  
+  g_mutex_unlock (&test_g_static_private_mutex);  
   return g_new (guint,1);
 }
 
 static void
 test_g_static_private_destructor (gpointer data)
 {
-  g_static_mutex_lock (&test_g_static_private_mutex);
+  g_mutex_lock (&test_g_static_private_mutex);
   test_g_static_private_counter--;
-  g_static_mutex_unlock (&test_g_static_private_mutex);  
+  g_mutex_unlock (&test_g_static_private_mutex);  
   g_free (data);
 }
 
@@ -162,9 +162,9 @@ test_g_static_private_thread (gpointer data)
       g_assert (number == *private1);
       g_assert (number * 2 == *private2);      
     }
-  g_static_mutex_lock (&test_g_static_private_mutex);
+  g_mutex_lock (&test_g_static_private_mutex);
   test_g_static_private_ready++;
-  g_static_mutex_unlock (&test_g_static_private_mutex);  
+  g_mutex_unlock (&test_g_static_private_mutex);  
 
   /* Busy wait is not nice but that's just a test */
   while (test_g_static_private_ready != 0)
@@ -374,24 +374,16 @@ void
 run_all_tests()
 {
   test_g_mutex ();
-  g_print (".");
   test_g_static_rec_mutex ();
-  g_print (".");
   test_g_static_private ();
-  g_print (".");
   test_g_static_rw_lock ();
-  g_print (".");
   test_g_thread_once ();
-  g_print (".");
 }
 
 int 
 main (int   argc,
       char *argv[])
 {
-  /* Only run the test, if threads are enabled and a default thread
-     implementation is available */
-#if defined(G_THREADS_ENABLED) && ! defined(G_THREADS_IMPL_NONE)
   g_thread_init (NULL);
   run_all_tests ();
 
@@ -401,8 +393,6 @@ main (int   argc,
 
   g_thread_use_default_impl = FALSE;
   run_all_tests ();
-  g_print ("\n");
   
-#endif
   return 0;
 }