Fix test crash.

diff --git a/ChangeLog b/ChangeLog
index 7f09e847e96b0cb8fb781d0b5844b5bd060b6e43..89ea5137a847cda5c161985b9d19d9dda0331faa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-12-30  Bruno Haible  <bruno@clisp.org>
+
+       Fix test crash.
+       * tests/test-localename.c (test_locale_name_thread): Skip unavailable
+       locales.
+       Reported by Simon Josefsson <simon@josefsson.org>.
+
 2009-12-30  Bruno Haible  <bruno@clisp.org>
 
        Fix compilation error on most platforms.

diff --git a/tests/test-localename.c b/tests/test-localename.c
index 9afa932441672fa0e96a884d111ea6878f80fd5a..6fc158db10c7acc189347aa2c24b41cd298ee094 100644 (file)
--- a/tests/test-localename.c
+++ b/tests/test-localename.c
@@ -419,12 +419,13 @@ test_locale_name_thread (void)
       }
     /* Verify the unsaved_names are still valid.  */
     for (j = 0; j < SIZEOF (choices); j++)
-      {
-        unsigned int i;
+      if (available[j])
+        {
+          unsigned int i;
 
-        for (i = 0; i < SIZEOF (categories); i++)
-          ASSERT (strcmp (unsaved_names[j][i], saved_names[j][i]) == 0);
-      }
+          for (i = 0; i < SIZEOF (categories); i++)
+            ASSERT (strcmp (unsaved_names[j][i], saved_names[j][i]) == 0);
+        }
     /* Allocate many locales, without freeing them.  This is an attempt at
        overwriting as much of the previously allocated memory as possible.  */
     for (j = SIZEOF (choices); j > 0; )
@@ -447,12 +448,13 @@ test_locale_name_thread (void)
       }
     /* Verify the unsaved_names are still valid.  */
     for (j = 0; j < SIZEOF (choices); j++)
-      {
-        unsigned int i;
+      if (available[j])
+        {
+          unsigned int i;
 
-        for (i = 0; i < SIZEOF (categories); i++)
-          ASSERT (strcmp (unsaved_names[j][i], saved_names[j][i]) == 0);
-      }
+          for (i = 0; i < SIZEOF (categories); i++)
+            ASSERT (strcmp (unsaved_names[j][i], saved_names[j][i]) == 0);
+        }
   }
 #else
   /* Check that gl_locale_name_thread always returns NULL.  */