X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Flanguage%2Fdictionary%2Fvalue-labels.at;h=1ddabf972ab671d92b8adb534c2b43ddb25801a3;hb=5cab4cf3322f29c0ed7134d23740e07382914f20;hp=b7e6eaf8d7499e2abc1829d598fec8ace060eb7c;hpb=37f0de7f0ee1870cf5fd4b802be092be844a5b95;p=pspp

diff --git a/tests/language/dictionary/value-labels.at b/tests/language/dictionary/value-labels.at
index b7e6eaf8d7..1ddabf972a 100644
--- a/tests/language/dictionary/value-labels.at
+++ b/tests/language/dictionary/value-labels.at
@@ -32,7 +32,7 @@ ad,1,,Scale,Input,8,Right,ADATE10,ADATE10,
 dt,2,,Scale,Input,8,Right,DATETIME20.0,DATETIME20.0,
 
 Table: Value Labels
-Variable,Value,Label
+Variable Value,,Label
 ad,07/10/1982,label 1
 ,01/02/1993,label 2
 ,05/04/2003,label 3
@@ -52,24 +52,25 @@ END DATA.
 DISPLAY DICTIONARY.
 FREQUENCIES x/STAT=NONE.
 ])
-AT_CHECK([pspp -O format=csv value-labels.sps], [0], [dnl
+AT_CHECK([pspp -o pspp.csv -o pspp.txt value-labels.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Variables
 Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
 x,1,,Scale,Input,8,Right,F8.2,F8.2,
 
 Table: Value Labels
-Variable,Value,Label
+Variable Value,,Label
 x,1.00,one
 ,2.00,first line\nsecond line
 ,3.00,three
 
 Table: x
-Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
-one,1.00,1,33.33,33.33,33.33
-"first line
-second line",2.00,1,33.33,33.33,66.67
-three,3.00,1,33.33,33.33,100.00
-Total,,3,100.0,100.0,
+,,Frequency,Percent,Valid Percent,Cumulative Percent
+Valid,one,1,33.3%,33.3%,33.3%
+,"first line
+second line",1,33.3%,33.3%,66.7%
+,three,1,33.3%,33.3%,100.0%
+Total,,3,100.0%,,
 ])
 AT_CLEANUP
 
@@ -90,24 +91,25 @@ GET FILE='value-labels.sav'.
 DISPLAY DICTIONARY.
 FREQUENCIES x/STAT=NONE.
 ])
-AT_CHECK([pspp -O format=csv get.sps], [0], [dnl
+AT_CHECK([pspp -o pspp.csv -o pspp.txt get.sps])
+AT_CHECK([cat pspp.csv], [0], [dnl
 Table: Variables
 Name,Position,Label,Measurement Level,Role,Width,Alignment,Print Format,Write Format,Missing Values
 x,1,,Scale,Input,8,Right,F8.2,F8.2,
 
 Table: Value Labels
-Variable,Value,Label
+Variable Value,,Label
 x,1.00,one
 ,2.00,first line\nsecond line
 ,3.00,three
 
 Table: x
-Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
-one,1.00,1,33.33,33.33,33.33
-"first line
-second line",2.00,1,33.33,33.33,66.67
-three,3.00,1,33.33,33.33,100.00
-Total,,3,100.0,100.0,
+,,Frequency,Percent,Valid Percent,Cumulative Percent
+Valid,one,1,33.3%,33.3%,33.3%
+,"first line
+second line",1,33.3%,33.3%,66.7%
+,three,1,33.3%,33.3%,100.0%
+Total,,3,100.0%,,
 ])
 AT_CLEANUP