i18n: Correctly recode windows-1258 and others with combining diacritics.

[pspp] / tests / libpspp / i18n.at

diff --git a/tests/libpspp/i18n.at b/tests/libpspp/i18n.at
index 421241e5db2f08b57cb766cf83b5c2bd9e16093a..974e76f590ef636b8f9946d4b6dc278ba95697aa 100644 (file)
--- a/tests/libpspp/i18n.at
+++ b/tests/libpspp/i18n.at
@@ -1,23 +1,5 @@
 AT_BANNER([i18n recoding])
 
-m4_divert_push([PREPARE_TESTS])
-supports_encodings () {
-  case "$host" in
-    *-*-linux* | *-*-*-gnu*)
-      dnl GNU/Linux always has the encodings we want.  We can't ask
-      dnl config.charset about them because it has a special case here
-      dnl too and won't tell us.
-      return 0
-      ;;
-    *)
-      for encoding in "$@"; do
-       $SHELL $top_srcdir/gl/config.charset "$host" | grep '$2' || return 77
-      done
-      ;;
-  esac
-}
-m4_divert_pop([PREPARE_TESTS])
-
 # CHECK_I18N_RECODE([TITLE], [FROM-CODING], [TO-CODING],
 #                   [FROM-TEXT], [TO-TEXT])
 #
@@ -30,7 +12,7 @@ m4_define([CHECK_I18N_RECODE],
    AT_KEYWORDS([i18n])
 
    dnl Skip the test if this host doesn't know the source and target encodings.
-   AT_CHECK([supports_encodings '$2' '$3'])
+   AT_CHECK([i18n-test supports_encodings '$2' '$3'])
    AT_CHECK_UNQUOTED([i18n-test recode '$2' '$3' `printf '$4'`], [0], [`printf '$5'`
 ])
    AT_CLEANUP])
@@ -50,6 +32,11 @@ CHECK_I18N_RECODE([invalid UTF-8 to ISO-8859-1], [UTF-8], [ISO-8859-1],
 CHECK_I18N_RECODE([truncated UTF-8 to ISO-8559-1], [UTF-8], [ISO-8859-1],
                   [xy\302], [xy?])
 
+# Checks for a bug that caused the last character to be dropped in conversions
+# from encodings that have combining diacritics (e.g. windows-1258).
+CHECK_I18N_RECODE([dropped final character in windows-1258], [windows-1258],
+                  [UTF8], [aeiou], [aeiou])
+
 dnl The input to this test is 7 bytes long and the expected output is 9 bytes.
 dnl So it should exercise the E2BIG case 
 CHECK_I18N_RECODE([from ISO-8859-1 to UTF-8 with overflow], 
@@ -80,7 +67,7 @@ m4_define([CHECK_I18N_CONCAT],
    AT_KEYWORDS([i18n])
 
    dnl Skip the test if this host doesn't know the encoding.
-   AT_CHECK([supports_encodings '$3'])
+   AT_CHECK([i18n-test supports_encodings '$3'])
    AT_CHECK_UNQUOTED(
      [i18n-test concat "`printf '$1'`" "`printf '$2'`" '$3' '$4'], [0],
      [`printf '$5'`