X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdata-io%2Fget-data-txt.at;h=f18fc978f8e04dab509cf0d30f8ec0c47ef415f9;hb=35fab6526c3b8491a05769cb72e24c00316c5d3f;hp=4418974701233658dd5531635391977994eba4b9;hpb=e87acf42e694cfae68040f62342becc7be3909a7;p=pspp

diff --git a/tests/language/data-io/get-data-txt.at b/tests/language/data-io/get-data-txt.at
index 4418974701..f18fc978f8 100644
--- a/tests/language/data-io/get-data-txt.at
+++ b/tests/language/data-io/get-data-txt.at
@@ -36,9 +36,12 @@ begin data.
 ,4,,5
 6
 7,
+
 8 9
 0,1,,,
+
 ,,,,
+
 2
 
 3
@@ -47,7 +50,7 @@ begin data.
 end data.
 list.
 ])
-AT_CHECK([pspp -o pspp.csv get-data.sps])
+AT_CHECK([pspp -o pspp.csv get-data.sps], [0], [ignore])
 AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Data List
 A,B,C,D
@@ -69,21 +72,21 @@ begin data.
 # These records
 # are skipped.
 1	2	3	4
-1	2	3	@&t@
+1	2	3	4	@&t@
 1	2		4
-1	2		@&t@
+1	2		4	@&t@
 1		3	4
-1		3	@&t@
+1		3	4	@&t@
 1			4
-1			@&t@
+1			4	@&t@
 	2	3	4
-	2	3	@&t@
+	2	3	4	@&t@
 	2		4
-	2		@&t@
+	2		4	@&t@
 		3	4
-		3	@&t@
+		3	4	@&t@
 			4
-			@&t@
+			4	@&t@
 end data.
 list.
 ])
@@ -92,21 +95,21 @@ AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Data List
 A,B,C,D
 1.00,2.00,3.00,4.00
-1.00,2.00,3.00,.  @&t@
+1.00,2.00,3.00,4.00
+1.00,2.00,.  ,4.00
 1.00,2.00,.  ,4.00
-1.00,2.00,.  ,.  @&t@
 1.00,.  ,3.00,4.00
-1.00,.  ,3.00,.  @&t@
+1.00,.  ,3.00,4.00
+1.00,.  ,.  ,4.00
 1.00,.  ,.  ,4.00
-1.00,.  ,.  ,.  @&t@
 .  ,2.00,3.00,4.00
-.  ,2.00,3.00,.  @&t@
+.  ,2.00,3.00,4.00
 .  ,2.00,.  ,4.00
-.  ,2.00,.  ,.  @&t@
+.  ,2.00,.  ,4.00
+.  ,.  ,3.00,4.00
 .  ,.  ,3.00,4.00
-.  ,.  ,3.00,.  @&t@
 .  ,.  ,.  ,4.00
-.  ,.  ,.  ,.  @&t@
+.  ,.  ,.  ,4.00
 ])
 AT_CLEANUP
 
@@ -568,3 +571,20 @@ x
 100
 ])
 AT_CLEANUP
+
+AT_SETUP([GET DATA /TYPE=TXT with ENCODING subcommand])
+AT_CHECK([i18n-test supports_encodings UTF-8 ISO-8859-1])
+AT_DATA([get-data.sps], [dnl
+set locale='utf-8'
+get data /type=txt /file='data.txt' /encoding='iso-8859-1'
+  /delimiters="," /variables=s a8.
+list.
+])
+printf '\351' > data.txt	# é in ISO-8859-1.
+AT_CHECK([pspp -o pspp.csv get-data.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
+Table: Data List
+s
+é      @&t@
+])
+AT_CLEANUP