X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Flibpspp%2Fencoding-guesser.at;h=e969a48aca8319236488678c902caaec16fdcd87;hb=refs%2Fheads%2Fpivot-table2;hp=d63dc37e7990ea90b5063f9d6f791ebe31252938;hpb=f3668539947d5baed813a4f8436d6cf36abeedd2;p=pspp

diff --git a/tests/libpspp/encoding-guesser.at b/tests/libpspp/encoding-guesser.at
index d63dc37e79..e969a48aca 100644
--- a/tests/libpspp/encoding-guesser.at
+++ b/tests/libpspp/encoding-guesser.at
@@ -8,14 +8,14 @@ AT_CLEANUP
 
 AT_SETUP([UTF-8])
 AT_KEYWORDS([encoding guesser])
-AT_CHECK([supports_encodings ISO-8859-1])
+AT_CHECK([i18n-test supports_encodings ISO-8859-1])
 AT_CHECK([printf '\346\227\245\346\234\254\350\252\236\n' | encoding-guesser-test Auto,ISO-8859-1], [0], [UTF-8
 ])
 AT_CLEANUP
 
 AT_SETUP([UTF-8 starting with ASCII])
 AT_KEYWORDS([encoding guesser])
-AT_CHECK([supports_encodings ISO-8859-1])
+AT_CHECK([i18n-test supports_encodings ISO-8859-1])
 AT_CHECK([printf 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\346\227\245\346\234\254\350\252\236\n' | encoding-guesser-test Auto,ISO-8859-1 32], [0], [UTF-8
 ])
 AT_CLEANUP
@@ -96,7 +96,7 @@ AT_CLEANUP
 
 AT_SETUP([ISO-8859-1])
 AT_KEYWORDS([encoding guesser])
-AT_CHECK([supports_encodings ISO-8859-1])
+AT_CHECK([i18n-test supports_encodings ISO-8859-1])
 AT_CHECK([printf 'entr\351e\n' | encoding-guesser-test Auto,ISO-8859-1], 
   [0], [ISO-8859-1
 ])
@@ -104,7 +104,7 @@ AT_CLEANUP
 
 AT_SETUP([GB-18030 with byte order mark])
 AT_KEYWORDS([encoding guesser])
-AT_CHECK([supports_encodings ISO-8859-1])
+AT_CHECK([i18n-test supports_encodings ISO-8859-1])
 AT_CHECK([printf '\204\061\225\063' | encoding-guesser-test Auto,ISO-8859-1], 
   [0], [GB-18030
 ])
@@ -112,7 +112,7 @@ AT_CLEANUP
 
 AT_SETUP([UTF-EBCDIC with byte order mark])
 AT_KEYWORDS([encoding guesser])
-AT_CHECK([supports_encodings ISO-8859-1])
+AT_CHECK([i18n-test supports_encodings ISO-8859-1])
 AT_CHECK([printf '\335\163\146\163' | encoding-guesser-test Auto,ISO-8859-1], 
   [0], [UTF-EBCDIC
 ])
@@ -120,7 +120,7 @@ AT_CLEANUP
 
 AT_SETUP([EUC-JP as Auto,EUC-JP])
 AT_KEYWORDS([encoding guesser])
-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' | encoding-guesser-test Auto,EUC-JP],
   [0], [EUC-JP
 ])
@@ -128,7 +128,7 @@ AT_CLEANUP
 
 AT_SETUP([EUC-JP starting with ASCII as Auto,EUC-JP])
 AT_KEYWORDS([encoding guesser])
-AT_CHECK([supports_encodings EUC-JP])
+AT_CHECK([i18n-test supports_encodings EUC-JP])
 AT_CHECK([printf 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx \244\241 \244\242 \244\243 \244\244 \244\245 \244\246 \244\247 \244\250 \244\251 \244\252\n' | encoding-guesser-test Auto,EUC-JP 32],
   [0], [EUC-JP
 ])
@@ -136,8 +136,16 @@ AT_CLEANUP
 
 AT_SETUP([UTF-8 with character split across input buffers])
 AT_KEYWORDS([encoding guesser])
-AT_CHECK([supports_encodings ISO-8859-1])
+AT_CHECK([i18n-test supports_encodings ISO-8859-1])
 AT_CHECK([printf '\343\201\201\343\201\202\343\201\203\343\201\204\343\201\205\343\201\206\343\201\207\343\201\210\343\201\211\343\201\212\343\201\201\343\201\202\343\201\203\343\201\204\343\201\205\343\201\206\343\201\207\343\201\210\343\201\211\343\201\212\n' | encoding-guesser-test Auto,ISO-8859-1 32],
   [0], [UTF-8
 ])
 AT_CLEANUP
+
+AT_SETUP([windows-1252 as Auto,UTF-8])
+AT_KEYWORDS([encoding guesser])
+AT_CHECK([i18n-test supports_encodings windows-1252])
+AT_CHECK([printf 'entr\351e' | encoding-guesser-test Auto,UTF-8 32], [0],
+  [windows-1252
+])
+AT_CLEANUP