New upstream version 1.3upstream/1.3upstream

1 files changed, 11 insertions, 5 deletions

diff --git a/tests/test-c-ctype.c b/tests/test-c-ctype.c
index 8414a31d..7816543a 100644
--- a/tests/test-c-ctype.c
+++ b/tests/test-c-ctype.c
@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <limits.h>
 #include <locale.h>
+#include <stdlib.h>
 
 #include "macros.h"
 
@@ -218,11 +219,16 @@ main ()
 
   test_all ();
 
-  setlocale (LC_ALL, "de_DE");
-  test_all ();
+  /* Run the tests in a German unibyte locale.  */
+  if ((setlocale (LC_ALL, "de_DE") != NULL
+       || setlocale (LC_ALL, "de_DE.ISO-8859-1") != NULL)
+      && MB_CUR_MAX == 1)
+    test_all ();
 
-  setlocale (LC_ALL, "ja_JP.EUC-JP");
-  test_all ();
+  /* Run the tests in a traditional Japanese locale.  */
+  if (setlocale (LC_ALL, "ja_JP.EUC-JP") != NULL
+      && MB_CUR_MAX == 2)
+    test_all ();
 
-  return 0;
+  return test_exit_status;
 }