Index: tests/Makefile.am
===================================================================
RCS file: /cvs/gnome/glib/tests/Makefile.am,v
retrieving revision 1.84
diff -u -p -d -r1.84 Makefile.am
--- tests/Makefile.am	4 Apr 2006 13:03:23 -0000	1.84
+++ tests/Makefile.am	5 Apr 2006 04:49:37 -0000
@@ -49,7 +49,12 @@ endif
 if ENABLE_TIMELOOP
 timeloop = timeloop timeloop-closure
 endif
-noinst_PROGRAMS = testglib testgdate testgdateparser unicode-normalize unicode-collate $(timeloop)
+noinst_PROGRAMS =		\
+	testglib		\
+	testgdate		\
+	testgdateparser		\
+	unicode-normalize	\
+	$(timeloop)
 testglib_LDADD = $(libglib)
 patterntest_LDADD = $(libglib)
 testgdate_LDADD = $(libglib)
@@ -64,7 +69,6 @@ test_programs =					\
 	atomic-test				\
 	array-test				\
 	base64-test				\
-	bookmarkfile-test 				\
 	$(CXX_TEST)				\
 	child-test				\
 	completion-test				\
@@ -110,9 +114,9 @@ test_programs =					\
 	utf8-pointer				\
 	uri-test
 
-test_scripts = run-markup-tests.sh run-collate-tests.sh
+test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh
 
-test_script_support_programs = markup-test unicode-collate
+test_script_support_programs = markup-test unicode-collate bookmarkfile-test
 
 check_PROGRAMS = $(test_programs) $(test_script_support_programs)
 
Index: tests/option-test.c
===================================================================
RCS file: /cvs/gnome/glib/tests/option-test.c,v
retrieving revision 1.17
diff -u -p -d -r1.17 option-test.c
--- tests/option-test.c	27 Mar 2006 13:37:02 -0000	1.17
+++ tests/option-test.c	5 Apr 2006 04:49:37 -0000
@@ -1,4 +1,5 @@
 #include <glib.h>
+#include <stdio.h>
 #include <string.h>
 #include <locale.h>
 
@@ -382,16 +383,21 @@ arg_test5 (void)
   argv = split_string ("program --test 20,0 --test 30,03", &argc);
 
   /* set it to some locale that uses commas instead of decimal points */
-  old_locale = g_strdup (setlocale(LC_NUMERIC, "de"));
+  old_locale = setlocale(LC_NUMERIC, "de_DE");
 
-  retval = g_option_context_parse (context, &argc, &argv, &error);
-  g_assert (retval);
+  if (old_locale)
+    {
+      /* only test if setting locale didn't fail. */
+      retval = g_option_context_parse (context, &argc, &argv, &error);
+      g_assert (retval);
 
-  /* Last arg specified is the one that should be stored */
-  g_assert (arg_test5_double == 30.03);
+      /* Last arg specified is the one that should be stored */
+      g_assert (arg_test5_double == 30.03);
 
-  setlocale(LC_NUMERIC, old_locale);
-  g_free (old_locale);
+      setlocale(LC_NUMERIC, old_locale);
+    }
+  else
+    fprintf (stderr, "Cannot set locale to de_DE, skipping part of the test\n");
 
   g_strfreev (argv);
   g_option_context_free (context);
@@ -907,13 +913,15 @@ empty_test1 (void)
   GOptionEntry entries [] =
     { { NULL } };
 
+  g_set_prgname (NULL);
+
   context = g_option_context_new (NULL);
 
   g_option_context_add_main_entries (context, entries, NULL);
   
   g_option_context_parse (context, NULL, NULL, NULL);
 
-  g_assert (strcmp (g_get_prgname (), "<unknown>") == 0);
+  g_assert (g_get_prgname() && strcmp (g_get_prgname (), "<unknown>") == 0);
   
   g_option_context_free (context);
 }
@@ -1333,7 +1341,6 @@ missing_arg_test (void)
   /* Try parsing again */
   argv = split_string ("program --t", &argc);
 
-  retval = g_option_context_parse (context, &argc, &argv, &error);
   g_assert (retval == FALSE);
 
   g_strfreev (argv);
Index: tests/run-collate-tests.sh
===================================================================
RCS file: /cvs/gnome/glib/tests/run-collate-tests.sh,v
retrieving revision 1.5
diff -u -p -d -r1.5 run-collate-tests.sh
--- tests/run-collate-tests.sh	27 Dec 2005 23:35:52 -0000	1.5
+++ tests/run-collate-tests.sh	5 Apr 2006 04:49:37 -0000
@@ -25,15 +25,15 @@ for I in ${srcdir:-.}/collate/*.in; do
   echo_v "Sorting $I"
   name=`basename $I .in`
   ./unicode-collate $I > collate.out
-  if ! diff collate.out ${srcdir:-.}/collate/$name.unicode; then 
+  if diff collate.out ${srcdir:-.}/collate/$name.unicode; then :; else
     fail "unexpected error when using g_utf8_collate() on $I"
   fi  
   ./unicode-collate --key $I > collate.out
-  if ! diff collate.out ${srcdir:-.}/collate/$name.unicode; then 
+  if diff collate.out ${srcdir:-.}/collate/$name.unicode; then :; else
     fail "unexpected error when using g_utf8_collate_key() on $I"
   fi  
   ./unicode-collate --file $I > collate.out
-  if ! diff collate.out ${srcdir:-.}/collate/$name.file; then 
+  if diff collate.out ${srcdir:-.}/collate/$name.file; then :; else
     fail "unexpected error when using g_utf8_collate_key_for_filename() on $I"
   fi  
 done
Index: tests/slice-test.c
===================================================================
RCS file: /cvs/gnome/glib/tests/slice-test.c,v
retrieving revision 1.5
diff -u -p -d -r1.5 slice-test.c
--- tests/slice-test.c	25 Jan 2006 15:51:43 -0000	1.5
+++ tests/slice-test.c	5 Apr 2006 04:49:37 -0000
@@ -189,7 +189,7 @@ test_sliced_mem_thread (gpointer data)
 static void
 usage (void)
 {
-  g_print ("Usage: gslicedmemory [n_threads] [G|S|M|O][f][c] [maxblocksize] [seed]\n");
+  g_print ("Usage: slice-test [n_threads] [G|S|M|O][f][c] [maxblocksize] [seed]\n");
 }
 
 int