Silently skip tests if we can't set LC_COLLATE to en_US. (#336438)

2006-12-24  Matthias Clasen  <mclasen@redhat.com>

        * tests/run-collate-tests.sh:
        * tests/unicode-collate.c: Silently skip tests if
        we can't set LC_COLLATE to en_US.  (#336438)

diff --git a/ChangeLog b/ChangeLog
index d119d735547248c56ca419916938ef59cad6d703..4695b61f49c466b81e7982d69d4216470b4a114b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-24  Matthias Clasen  <mclasen@redhat.com>
+
+       * tests/run-collate-tests.sh:
+       * tests/unicode-collate.c: Silently skip tests if
+       we can't set LC_COLLATE to en_US.  (#336438)
+
 2006-12-19  Matthias Clasen  <mclasen@redhat.com>
 
        * glib/gkeyfile.c (g_key_file_is_key_name): Accept

diff --git a/tests/run-collate-tests.sh b/tests/run-collate-tests.sh
index b27f7d65205f459a073b681a9b0a08ca096e434c..24f3d690c6ae4499306058abe54c7173a40db163 100755 (executable)
--- a/tests/run-collate-tests.sh
+++ b/tests/run-collate-tests.sh
@@ -13,9 +13,6 @@ echo_v ()
   fi
 }
 
-LC_ALL=en_US
-export LC_ALL
-
 error_out=/dev/null
 if [ "$1" = "-v" ]; then
   verbose=1
@@ -25,6 +22,9 @@ for I in ${srcdir:-.}/collate/*.in; do
   echo_v "Sorting $I"
   name=`basename $I .in`
   ./unicode-collate $I > collate.out
+  if [ $? -eq 2 ]; then
+    exit 0
+  fi   
   diff collate.out ${srcdir:-.}/collate/$name.unicode || 
     fail "unexpected error when using g_utf8_collate() on $I"
   ./unicode-collate --key $I > collate.out

diff --git a/tests/unicode-collate.c b/tests/unicode-collate.c
index 009b00fa0ee0ab07b6a623ff44ea23e728c69a3f..785f1690990026a17459786940546130dce3a2cb 100644 (file)
--- a/tests/unicode-collate.c
+++ b/tests/unicode-collate.c
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <locale.h>
 
 typedef struct {
   const char *key;
@@ -38,6 +39,18 @@ int main (int argc, char **argv)
   guint i;
   gboolean do_key = FALSE;
   gboolean do_file = FALSE;
+  gchar *locale;
+
+  /* FIXME: need to modify environment here,
+   * since g_utf8_collate_key calls setlocal (LC_COLLATE, "")
+   */
+  g_setenv ("LC_ALL", "en_US", TRUE);
+  locale = setlocale (LC_ALL, "");
+  if (locale == NULL || strcmp (locale, "en_US") != 0)
+    {
+      fprintf (stderr, "No suitable locale, skipping test\n"); 
+      return 2;
+    }
 
   if (argc != 1 && argc != 2 && argc != 3)
     {