glib r7701 - in branches/glib-2-18: . glib/tests

[matthiasc svn gnome org]

Author: matthiasc
Date: Fri Nov 28 19:15:55 2008
New Revision: 7701
URL: http://svn.gnome.org/viewvc/glib?rev=7701&view=rev

Log:
Fix the build


Modified:
   branches/glib-2-18/ChangeLog
   branches/glib-2-18/glib/tests/option-context.c

Modified: branches/glib-2-18/glib/tests/option-context.c
==============================================================================
--- branches/glib-2-18/glib/tests/option-context.c	(original)
+++ branches/glib-2-18/glib/tests/option-context.c	Fri Nov 28 19:15:55 2008
@@ -426,6 +426,14 @@
     }
 }
 
+static void
+assert_error (GError *error, 
+              GQuark *domain, 
+              gint    code)
+{
+  g_assert (error && error->domain == domain && error->code == code);
+}
+
 void
 arg_test1 (void)
 {
@@ -1054,7 +1062,7 @@
   argv = split_string ("program --error value", &argc);
   
   retval = g_option_context_parse (context, &argc, &argv, &error);
-  g_assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE);
+  assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE);
   g_assert (retval == FALSE);
 
   g_option_context_free (context);
@@ -1067,7 +1075,7 @@
   argv = split_string ("program --error-no-arg", &argc);
   
   retval = g_option_context_parse (context, &argc, &argv, &error);
-  g_assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE);
+  assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE);
   g_assert (retval == FALSE);
 
   g_option_context_free (context);
@@ -1080,7 +1088,7 @@
   argv = split_string ("program --error-optional-arg value", &argc);
   
   retval = g_option_context_parse (context, &argc, &argv, &error);
-  g_assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE);
+  assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE);
   g_assert (retval == FALSE);
 
   g_option_context_free (context);
@@ -1093,7 +1101,7 @@
   argv = split_string ("program --error-optional-arg", &argc);
   
   retval = g_option_context_parse (context, &argc, &argv, &error);
-  g_assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE);
+  assert_error (error, G_OPTION_ERROR, G_OPTION_ERROR_BAD_VALUE);
   g_assert (retval == FALSE);
 
   g_option_context_free (context);