tests: Improve test for supported encodings.

[pspp] / tests / libpspp / u8-istream.at

diff --git a/tests/libpspp/u8-istream.at b/tests/libpspp/u8-istream.at
index 2d8baa4745448d76a906ef739acc5421193bcac9..985805d7ee0e6605bc24651e0c61a6167f53fda1 100644 (file)
--- a/tests/libpspp/u8-istream.at
+++ b/tests/libpspp/u8-istream.at
@@ -2,7 +2,7 @@ AT_BANNER([u8_istream])
 
 AT_SETUP([read ASCII])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings ASCII])
+AT_CHECK([i18n-test supports_encodings ASCII])
 AT_CHECK([echo string | u8-istream-test read - ASCII], [0], [string
 ])
 AT_CLEANUP
@@ -18,7 +18,7 @@ AT_CLEANUP
 
 AT_SETUP([read EUC-JP])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 AT_CHECK([printf '\244\241 \244\242 \244\243 \244\244 \244\245 \244\246 \244\247 \244\250 \244\251 \244\252\n' | u8-istream-test read - EUC-JP],
   [0],
   [ぁ あ ぃ い ぅ う ぇ え ぉ お
@@ -58,7 +58,7 @@ AT_CLEANUP
 
 AT_SETUP([read EUC-JP with character split across input buffers])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 buffer_size=`u8-istream-test buffer-size`
 ($PERL -e "print 'x' x ($buffer_size - 16)"
  printf '\244\241 \244\242 \244\243 \244\244 \244\245 \244\246 \244\247 '
@@ -72,7 +72,7 @@ AT_CLEANUP
 
 AT_SETUP([read EUC-JP with character split across output buffers])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 AT_CHECK([printf '\244\241\244\242\244\243\244\244\244\245\244\246\244\247\244\250\244\251\244\252\n' | u8-istream-test read - EUC-JP 16],
   [0],
   [ぁあぃいぅうぇえぉお
@@ -81,7 +81,7 @@ AT_CLEANUP
 
 AT_SETUP([read EUC-JP with character split across input and output buffers])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 buffer_size=`u8-istream-test buffer-size`
 ($PERL -e "print 'x' x ($buffer_size - 16)"
  printf 'xyz\244\241\244\242\244\243\244\244\244\245\244\246\244\247\244\250'
@@ -113,7 +113,7 @@ AT_CLEANUP
 
 AT_SETUP([read ISO-8859-1 as Auto,ISO-8859-1])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings ISO-8859-1])
+AT_CHECK([i18n-test supports_encodings ISO-8859-1])
 buffer_size=`u8-istream-test buffer-size`
 ($PERL -e "print 'x' x int($buffer_size * 2.5)"; printf 'entr\351e\n') > input
 (echo "Auto mode"
@@ -125,7 +125,7 @@ AT_CLEANUP
 dnl UTF-16BE is not ASCII compatible so this doesn't start out in Auto mode.
 AT_SETUP([read UTF-16BE as Auto,UTF-16BE])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings UTF-16BE])
+AT_CHECK([i18n-test supports_encodings UTF-16BE])
 AT_CHECK([printf '\0e\0n\0t\0r\0\351\0e\0\n' | u8-istream-test read - Auto,UTF-16BE], 
   [0], [dnl
 entrée
@@ -134,7 +134,7 @@ AT_CLEANUP
 
 AT_SETUP([read EUC-JP as Auto,EUC-JP])
 AT_KEYWORDS([u8_istream])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 AT_CHECK([printf 'entr\217\253\261e\n' | u8-istream-test read - Auto,EUC-JP], 
   [0], [entrée
 ])