Changeset 2162 for trunk

Timestamp:

Jul 3, 2005, 2:39:06 AM (20 years ago)

Author:

bird

Message:

extended the test a bit.

File:

• trunk/src/libctests/glibc/locale/tst-C-locale.c (modified) (5 diffs, 1 prop)

trunk/src/libctests/glibc/locale/tst-C-locale.c

@@ -36 +36 @@
   const wchar_t *wstr;
   int result = 0;
+#ifdef HAVE_NEWLOCALE
   locale_t loc;
+#endif
 
   /* ISO C stuff.  */
@@ -167 +169 @@
   STRTEST (NOEXPR, "^[nN]");
 
+#ifdef HAVE_NL_LANGINFO_EXTENTIONS
   /* Extensions.  */
   WSTRTEST (_NL_WABDAY_1, L"Sun");
@@ -228 +231 @@
   STRTEST (NEGATIVE_SIGN, "");
   STRTEST (GROUPING, "");
+#endif /* HAVE_NL_LANGINFO_EXTENTIONS */
 
   STRTEST (YESSTR, "");
   STRTEST (NOSTR, "");
 
+
+#ifdef HAVE_NEWLOCALE
   /* Test the new locale mechanisms.  */
   loc = newlocale (LC_ALL_MASK, locname, NULL);
@@ -464 +470 @@
       freelocale (loc);
     }
+#endif /* HAVE_NEWLOCALE */
 
   return result;
@@ -492 +499 @@
     result |= run_test ("POSIX");
 
+  /* Replace the locale, set it back to C and retry.  */
+  if (   setlocale (LC_ALL, "jp_JP") != NULL
+      || setlocale (LC_ALL, "jp") != NULL
+      || setlocale (LC_ALL, "de_DE") != NULL
+      || setlocale (LC_ALL, "no_NO") != NULL
+      || setlocale (LC_ALL, "en_US") != NULL
+      || setlocale (LC_ALL, "en") != NULL
+      )
+    {
+      /* First use the name "C".  */
+      if (setlocale (LC_ALL, "C") == NULL)
+        {
+          puts ("cannot set C locale");
+          result = 1;
+        }
+      else
+        result = run_test ("Retest C");
+
+      /* Then the name "POSIX".  */
+      if (setlocale (LC_ALL, "POSIX") == NULL)
+        {
+          puts ("cannot set POSIX locale");
+          result = 1;
+        }
+      else
+        result |= run_test ("Retest POSIX");
+    }
+  else
+    puts ("Skipping last test since we fail to find a valid locale.");
+
   return result;
 }