X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Futilities%2Finsert.at;h=e8e76502da5a4ca621f343ba16795ad06f4ffd05;hb=79726c95127b30a09d59fc074579a84478593afb;hp=34376b1517c31902be8560e4824960005c59967e;hpb=9ade26c8349b4434008c46cf09bc7473ec743972;p=pspp

diff --git a/tests/language/utilities/insert.at b/tests/language/utilities/insert.at
index 34376b1517..e8e76502da 100644
--- a/tests/language/utilities/insert.at
+++ b/tests/language/utilities/insert.at
@@ -22,9 +22,9 @@ LIST.
 ])
 AT_CHECK([pspp -o pspp.csv insert.sps], [1], [dnl
 batch.sps:2.1-2.4: error: INPUT PROGRAM: Syntax error at `loop': expecting end of command.
-batch.sps:3: error: COMPUTE: COMPUTE is allowed only after the active file has been defined or inside INPUT PROGRAM.
+batch.sps:3: error: COMPUTE: COMPUTE is allowed only after the active dataset has been defined or inside INPUT PROGRAM.
 batch.sps:4: error: END CASE: END CASE is allowed only inside INPUT PROGRAM.
-insert.sps:4: error: LIST: LIST is allowed only after the active file has been defined.
+insert.sps:4: error: LIST: LIST is allowed only after the active dataset has been defined.
 ])
 AT_CLEANUP
 
@@ -65,7 +65,7 @@ END DATA.
 ])
 AT_CHECK([pspp -o pspp.csv insert.sps], [1], [dnl
 Dir1/foo.sps:1: error: INSERT: Can't find `bar.sps' in include file search path.
-insert.sps:2: error: LIST: LIST is allowed only after the active file has been defined.
+insert.sps:2: error: LIST: LIST is allowed only after the active dataset has been defined.
 ])
 AT_CLEANUP
 
@@ -155,6 +155,29 @@ LIST.
 AT_CHECK([pspp -O format=csv insert.sps], [1], [dnl
 insert.sps:2: error: INSERT: Can't find `nonexistent' in include file search path.
 
-insert.sps:6: error: LIST: LIST is allowed only after the active file has been defined.
+insert.sps:6: error: LIST: LIST is allowed only after the active dataset has been defined.
+])
+AT_CLEANUP
+
+
+dnl A test to check the INCLUDE command complete with the 
+dnl syntax and function of the ENCODING subcommand.
+AT_SETUP([INCLUDE full check])
+AT_DATA([two-utf8.sps], [dnl
+echo 'Äpfelfölfaß'.
+])
+
+AT_DATA([include.sps], [dnl
+echo 'ONE'.
+
+include FILE='two-latin1.sps' ENCODING='ISO_8859-1'.
+])
+
+AT_CHECK([iconv -f UTF-8 -t iso-8859-1 two-utf8.sps > two-latin1.sps], [0], [])
+
+AT_CHECK([pspp -O format=csv include.sps], [0], [dnl
+ONE
+
+Äpfelfölfaß
 ])
 AT_CLEANUP