X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Foutput%2Fcharts.at;h=7cbaeb2e823fc5ed78adf454743f0b91bddaf1f4;hb=c43455db6f3f1191d969c42b8e679e0fddc44e78;hp=0b951845d8157067c58d58d84ce9b443b2673c7a;hpb=5443c41f89a2b29cf8cf55f21eecb839fae08177;p=pspp

diff --git a/tests/output/charts.at b/tests/output/charts.at
index 0b951845d8..7cbaeb2e82 100644
--- a/tests/output/charts.at
+++ b/tests/output/charts.at
@@ -33,7 +33,7 @@ examine x y by a
 	.
 ])
 
-AT_CHECK([pspp -O format=csv charts.sps], [0], [ignore])
+AT_CHECK([pspp -o pspp.txt charts.sps], [0], [ignore])
 
 AT_CLEANUP
 
@@ -85,7 +85,7 @@ ROC /fred bert charlie by group (0)
 
 ])
 
-AT_CHECK([pspp -O format=csv roc.sps], [0], [ignore])
+AT_CHECK([pspp -o pspp.txt roc.sps], [0], [ignore])
 
 AT_CLEANUP
 
@@ -115,7 +115,7 @@ factor /variables = all
 
 ])
 
-AT_CHECK([pspp -O format=csv scree.sps], [0], [ignore])
+AT_CHECK([pspp -o pspp.txt scree.sps], [0], [ignore])
 
 AT_CLEANUP
 
@@ -152,7 +152,7 @@ frequencies pos neg pn
 
 
 dnl The --testing-mode flag is important!!
-AT_CHECK([pspp --testing-mode -O format=csv histogram.sps], [0], [ignore])
+AT_CHECK([pspp --testing-mode -o pspp.txt histogram.sps], [0], [ignore])
 
 AT_CLEANUP
 
@@ -189,6 +189,49 @@ FREQUENCIES /VARIABLES=religion nationality /BARCHART /PIECHART.
 ])
 
 
-AT_CHECK([pspp  -O format=csv xxx.sps], [0], [ignore])
+AT_CHECK([pspp  -o pspp.txt xxx.sps], [0], [ignore])
+
+AT_CLEANUP
+
+
+
+AT_SETUP([CROSSTABS charts])
+AT_DATA([xxx.sps],[
+DATA LIST LIST /nationality (A10)  religion (A20) gender (A8).
+BEGIN DATA.
+Australian  Sikh      Male
+Australian  Sikh      Male
+Australian  Sikh      Male
+Australian  Sikh      Male
+British     Zoroastrian Female
+British     Buddist   Female
+British     Buddist   Female
+British      Zoroastrian Female
+German      Muslim    Male
+German      Christian Male
+German      Christian Female
+German      Christian Male
+German      Zoroastrian Female
+German      Sikh   Female
+German      Muslim Female
+German      Pastafarian Female
+German      "Jedi Knight" Female
+Belgian     Sikh      Male
+French       Muslim      Male
+French       Muslim      Male
+French       Christian      Male
+END DATA.
+
+
+CROSSTABS 
+	  /tables = nationality by religion by gender
+	  /tables = nationality by religion
+	  /tables = religion by gender
+	  /tables = nationality by religion by gender
+	  /barchart.
+])
+
+
+AT_CHECK([pspp  -o pspp.txt xxx.sps], [0], [ignore])
 
 AT_CLEANUP