X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Foneway.sh;h=339456d3d9680dd327fbeebc34344558d3504db4;hb=64322c8ee0af7bf5ecc825ccc90513118732f335;hp=f647e4e0bbbb8fd6b6269723ed99e91a2cc21a0c;hpb=c87fb686f323f651a1d3f3892c31bf66788916d9;p=pspp-builds.git

diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index f647e4e0..339456d3 100755
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.sh
@@ -3,18 +3,29 @@
 # This program tests that the ONEWAY anova command works OK
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 # ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
-     rm -rf $TEMPDIR
+    if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo Not cleaning $TEMPDIR;
+	return ; 
+    fi
+    cd /
+    rm -rf $TEMPDIR
 }
 
 
@@ -46,8 +57,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,43 +85,52 @@ 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 $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#
 |QUALITY |F8.0  |
 |BRAND   |F8.0  |
 +--------+------+
-
-2.1 ONEWAY.  Test of Homogeneity of Variances
+2.1 ONEWAY.  Descriptives
+#===============#========#==#====#==============#==========#=======================#=======#=======#
+#               |        #  |    |              |          |95% Confidence Interval|       |       #
+#               |        #  |    |              |          +-----------+-----------+       |       #
+#               |        # 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#
+#Breaking Strain#             .09|  2| 12|         .91#
 #===============#================#===#===#============#
-
-2.2 ONEWAY.  ANOVA
-#==============================#==============#==#===========#=====#============#
-#                              #Sum of Squares|df|Mean Square|  F  |Significance#
-#===============#==============#==============#==#===========#=====#============#
-#Breaking Strain|Between Groups#         20.13| 2|     10.067|5.119|        .025#
-#               |Within Groups #         23.60|12|      1.967|     |            #
-#               |Total         #         43.73|14|           |     |            #
-#===============#==============#==============#==#===========#=====#============#
-
-2.3 ONEWAY.  Contrast Coefficients
+2.3 ONEWAY.  ANOVA
+#==============================#==============#==#===========#====#============#
+#                              #Sum of Squares|df|Mean Square|  F |Significance#
+#===============#==============#==============#==#===========#====#============#
+#Breaking Strain|Between Groups#         20.13| 2|      10.07|5.12|         .02#
+#               |Within Groups #         23.60|12|       1.97|    |            #
+#               |Total         #         43.73|14|           |    |            #
+#===============#==============#==============#==#===========#====#============#
+2.4 ONEWAY.  Contrast Coefficients
 #==========#=======================#
 #          #      Manufacturer     #
 #          #-------+------+--------#
@@ -119,17 +139,15 @@ diff $TEMPDIR/pspp.list - << EOF
 #Contrast|1#     -2|     1|       1#
 #        |2#      0|    -1|       1#
 #========#=#=======#======#========#
-
-2.4 ONEWAY.  Contrast Tests
-#===============================================#=================#==========#=====#=====#===============#
-#                                       Contrast#Value of Contrast|Std. Error|  t  |  df |Sig. (2-tailed)#
-#===============#======================#========#=================#==========#=====#=====#===============#
-#Breaking Strain|Assume equal variances|    1   #             3.80|     1.536|2.474|   12|           .029#
-#               |                      |    2   #             1.80|      .887|2.029|   12|           .065#
-#               |Does not assume equal |    1   #             3.80|     1.483|2.562|8.740|           .031#
-#               |                      |    2   #             1.80|      .917|1.964|7.720|           .086#
-#===============#======================#========#=================#==========#=====#=====#===============#
-
+2.5 ONEWAY.  Contrast Tests
+#===============================================#=================#==========#====#====#===============#
+#                                       Contrast#Value of Contrast|Std. Error|  t | df |Sig. (2-tailed)#
+#===============#======================#========#=================#==========#====#====#===============#
+#Breaking Strain|Assume equal variances|    1   #             3.80|      1.54|2.47|  12|            .03#
+#               |                      |    2   #             1.80|       .89|2.03|  12|            .07#
+#               |Does not assume equal |    1   #             3.80|      1.48|2.56|8.74|            .03#
+#               |                      |    2   #             1.80|       .92|1.96|7.72|            .09#
+#===============#======================#========#=================#==========#====#====#===============#
 EOF
 if [ $? -ne 0 ] ; then fail ; fi