[glib] two test fixes for ARM

[Ryan Lortie <ryanl src gnome org>]

commit a2e9318d4a8dc1257526814b8255210acd13d406
Author: Ryan Lortie <desrt desrt ca>
Date:   Wed Dec 14 09:32:11 2011 -0500

    two test fixes for ARM
    
    First, some ARM systems are not fast enough to meet the 30 second
    deadline in gwakeuptest.c, so increase that to 60.
    
    Second, we have some signed/unsigned woes in the gparam transform tests.

 glib/tests/gwakeuptest.c |    4 ++--
 gobject/tests/param.c    |   20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/glib/tests/gwakeuptest.c b/glib/tests/gwakeuptest.c
index 263327c..a30a9f8 100644
--- a/glib/tests/gwakeuptest.c
+++ b/glib/tests/gwakeuptest.c
@@ -31,7 +31,7 @@ test_semantics (void)
   gint i;
 
   /* prevent the test from deadlocking */
-  alarm (30);
+  alarm (60);
 
   wakeup = g_wakeup_new ();
   g_assert (!check_signaled (wakeup));
@@ -210,7 +210,7 @@ test_threaded (void)
   gint i;
 
   /* make sure we don't block forever */
-  alarm (30);
+  alarm (60);
 
   /* simple mainloop test based on GWakeup.
    *
diff --git a/gobject/tests/param.c b/gobject/tests/param.c
index 5ab1a7d..e048ebc 100644
--- a/gobject/tests/param.c
+++ b/gobject/tests/param.c
@@ -204,8 +204,8 @@ test_value_transform (void)
   g_value_unset (&src);                                                 \
   g_value_unset (&dest);
 
-  CHECK_LONG_CONVERSION(G_TYPE_CHAR, char, -124)
-  CHECK_LONG_CONVERSION(G_TYPE_CHAR, char, 124)
+  CHECK_LONG_CONVERSION(G_TYPE_CHAR, schar, -124)
+  CHECK_LONG_CONVERSION(G_TYPE_CHAR, schar, 124)
   CHECK_LONG_CONVERSION(G_TYPE_UCHAR, uchar, 0)
   CHECK_LONG_CONVERSION(G_TYPE_UCHAR, uchar, 255)
   CHECK_LONG_CONVERSION(G_TYPE_INT, int, -12345)
@@ -254,8 +254,8 @@ test_value_transform (void)
   g_value_unset (&src);                                                 \
   g_value_unset (&dest);
 
-  CHECK_INT64_CONVERSION(G_TYPE_CHAR, char, -124)
-  CHECK_INT64_CONVERSION(G_TYPE_CHAR, char, 124)
+  CHECK_INT64_CONVERSION(G_TYPE_CHAR, schar, -124)
+  CHECK_INT64_CONVERSION(G_TYPE_CHAR, schar, 124)
   CHECK_INT64_CONVERSION(G_TYPE_UCHAR, uchar, 0)
   CHECK_INT64_CONVERSION(G_TYPE_UCHAR, uchar, 255)
   CHECK_INT64_CONVERSION(G_TYPE_INT, int, -12345)
@@ -279,8 +279,8 @@ test_value_transform (void)
   g_value_unset (&src);                                                 \
   g_value_unset (&dest);
 
-  CHECK_UINT64_CONVERSION(G_TYPE_CHAR, char, -124)
-  CHECK_UINT64_CONVERSION(G_TYPE_CHAR, char, 124)
+  CHECK_UINT64_CONVERSION(G_TYPE_CHAR, schar, -124)
+  CHECK_UINT64_CONVERSION(G_TYPE_CHAR, schar, 124)
   CHECK_UINT64_CONVERSION(G_TYPE_UCHAR, uchar, 0)
   CHECK_UINT64_CONVERSION(G_TYPE_UCHAR, uchar, 255)
   CHECK_UINT64_CONVERSION(G_TYPE_INT, int, -12345)
@@ -304,8 +304,8 @@ test_value_transform (void)
   g_value_unset (&src);                                                \
   g_value_unset (&dest);
 
-  CHECK_FLOAT_CONVERSION(G_TYPE_CHAR, char, -124)
-  CHECK_FLOAT_CONVERSION(G_TYPE_CHAR, char, 124)
+  CHECK_FLOAT_CONVERSION(G_TYPE_CHAR, schar, -124)
+  CHECK_FLOAT_CONVERSION(G_TYPE_CHAR, schar, 124)
   CHECK_FLOAT_CONVERSION(G_TYPE_UCHAR, uchar, 0)
   CHECK_FLOAT_CONVERSION(G_TYPE_UCHAR, uchar, 255)
   CHECK_FLOAT_CONVERSION(G_TYPE_INT, int, -12345)
@@ -329,8 +329,8 @@ test_value_transform (void)
   g_value_unset (&src);                                                 \
   g_value_unset (&dest);
 
-  CHECK_DOUBLE_CONVERSION(G_TYPE_CHAR, char, -124)
-  CHECK_DOUBLE_CONVERSION(G_TYPE_CHAR, char, 124)
+  CHECK_DOUBLE_CONVERSION(G_TYPE_CHAR, schar, -124)
+  CHECK_DOUBLE_CONVERSION(G_TYPE_CHAR, schar, 124)
   CHECK_DOUBLE_CONVERSION(G_TYPE_UCHAR, uchar, 0)
   CHECK_DOUBLE_CONVERSION(G_TYPE_UCHAR, uchar, 255)
   CHECK_DOUBLE_CONVERSION(G_TYPE_INT, int, -12345)