X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Foneway.sh;h=c5f251c136899f178c1dc1048e928955f13402eb;hb=58cb8593c7e0f675e5382de3fd387375bab58370;hp=22e88456895c137d3fc7253d2b9b2c623df9aee7;hpb=1339492699ce7e12c9bf9fa17f9d60a66024cbd1;p=pspp-builds.git

diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index 22e88456..c5f251c1 100755
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.sh
@@ -5,17 +5,27 @@
 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
 }
 
 
@@ -83,21 +93,21 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff -b -B $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.  Descriptives
 #===============#========#==#====#==============#==========#=======================#=======#=======#
-#               |        #  |    |              |          |    95% Confidence     |       |       #
+#               |        #  |    |              |          |95% Confidence Interval|       |       #
 #               |        #  |    |              |          +-----------+-----------+       |       #
 #               |        # N|Mean|Std. Deviation|Std. Error|Lower Bound|Upper Bound|Minimum|Maximum#
 #===============#========#==#====#==============#==========#===========#===========#=======#=======#
@@ -106,14 +116,12 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 #               |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.3 ONEWAY.  ANOVA
 #==============================#==============#==#===========#=====#============#
 #                              #Sum of Squares|df|Mean Square|  F  |Significance#
@@ -122,7 +130,6 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 #               |Within Groups #         23.60|12|      1.967|     |            #
 #               |Total         #         43.73|14|           |     |            #
 #===============#==============#==============#==#===========#=====#============#
-
 2.4 ONEWAY.  Contrast Coefficients
 #==========#=======================#
 #          #      Manufacturer     #
@@ -132,7 +139,6 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 #Contrast|1#     -2|     1|       1#
 #        |2#      0|    -1|       1#
 #========#=#=======#======#========#
-
 2.5 ONEWAY.  Contrast Tests
 #===============================================#=================#==========#=====#=====#===============#
 #                                       Contrast#Value of Contrast|Std. Error|  t  |  df |Sig. (2-tailed)#
@@ -142,7 +148,6 @@ diff -b -B $TEMPDIR/pspp.list - << EOF
 #               |Does not assume equal |    1   #             3.80|     1.483|2.562|8.740|           .031#
 #               |                      |    2   #             1.80|      .917|1.964|7.720|           .086#
 #===============#======================#========#=================#==========#=====#=====#===============#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi