X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Foneway.sh;h=6245ec8fd28e3d7e2941efdfad5c3392a4b620c3;hb=5a33cc6d78fe87ff5e9bd32ea4af3f895e4ad2fc;hp=f647e4e0bbbb8fd6b6269723ed99e91a2cc21a0c;hpb=c87fb686f323f651a1d3f3892c31bf66788916d9;p=pspp

diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index f647e4e0bb..6245ec8fd2 100755
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.sh
@@ -3,6 +3,7 @@
 # This program tests that the ONEWAY anova command works OK
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -14,7 +15,11 @@ export STAT_CONFIG_PATH=$top_srcdir/config
 
 cleanup()
 {
-     rm -rf $TEMPDIR
+    if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo Not cleaning $TEMPDIR;
+	return ; 
+    fi
+    rm -rf $TEMPDIR
 }
 
 
@@ -46,8 +51,8 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
-DATA LIST LIST /quality * brand * .
+cat > $TESTFILE <<EOF
+DATA LIST LIST /QUALITY * BRAND * .
 BEGIN DATA
 3 1
 2 1
@@ -74,18 +79,18 @@ VALUE LABELS /brand 1 'Aspeger' 2 'Bloggs' 3 'Charlies'.
 ONEWAY
 	quality BY brand
 	/STATISTICS descriptives homogeneity
-	/CONTRASTS =  -2 1 1 
-	/CONTRASTS = 0 -1 1
+	/CONTRAST =  -2 1 1 
+	/CONTRAST = 0 -1 1
 	.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff $TEMPDIR/pspp.list - << EOF
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -94,14 +99,26 @@ diff $TEMPDIR/pspp.list - << EOF
 |BRAND   |F8.0  |
 +--------+------+
 
-2.1 ONEWAY.  Test of Homogeneity of Variances
+2.1 ONEWAY.  Descriptives
+#===============#========#==#====#==============#==========#=======================#=======#=======#
+#               |        #  |    |              |          |    95% Confidence     |       |       #
+#               |        #  |    |              |          +-----------+-----------+       |       #
+#               |        # N|Mean|Std. Deviation|Std. Error|Lower Bound|Upper Bound|Minimum|Maximum#
+#===============#========#==#====#==============#==========#===========#===========#=======#=======#
+#Breaking Strain|Aspeger # 5|2.20|          1.30|       .58|        .58|       3.82|   1.00|   4.00#
+#               |Bloggs  # 5|3.20|          1.30|       .58|       1.58|       4.82|   2.00|   5.00#
+#               |Charlies# 5|5.00|          1.58|       .71|       3.04|       6.96|   3.00|   7.00#
+#               |Total   #15|3.47|          1.77|       .46|       2.49|       4.45|   1.00|   7.00#
+#===============#========#==#====#==============#==========#===========#===========#=======#=======#
+
+2.2 ONEWAY.  Test of Homogeneity of Variances
 #===============#================#===#===#============#
 #               #Levene Statistic|df1|df2|Significance#
 #===============#================#===#===#============#
 #Breaking Strain#            .092|  2| 12|        .913#
 #===============#================#===#===#============#
 
-2.2 ONEWAY.  ANOVA
+2.3 ONEWAY.  ANOVA
 #==============================#==============#==#===========#=====#============#
 #                              #Sum of Squares|df|Mean Square|  F  |Significance#
 #===============#==============#==============#==#===========#=====#============#
@@ -110,7 +127,7 @@ diff $TEMPDIR/pspp.list - << EOF
 #               |Total         #         43.73|14|           |     |            #
 #===============#==============#==============#==#===========#=====#============#
 
-2.3 ONEWAY.  Contrast Coefficients
+2.4 ONEWAY.  Contrast Coefficients
 #==========#=======================#
 #          #      Manufacturer     #
 #          #-------+------+--------#
@@ -120,7 +137,7 @@ diff $TEMPDIR/pspp.list - << EOF
 #        |2#      0|    -1|       1#
 #========#=#=======#======#========#
 
-2.4 ONEWAY.  Contrast Tests
+2.5 ONEWAY.  Contrast Tests
 #===============================================#=================#==========#=====#=====#===============#
 #                                       Contrast#Value of Contrast|Std. Error|  t  |  df |Sig. (2-tailed)#
 #===============#======================#========#=================#==========#=====#=====#===============#