X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-1-indep-val.sh;h=ba3e5c5f4e15aabccc4e8c96da676f4327e29da7;hb=a26729420e8d53045e12fe309202aa5cc3693da2;hp=e149ac7995509997a0e406f94bce33fce78d66f4;hpb=44d7b18d5c3d0a806fe1a29658445254f2376600;p=pspp-builds.git

diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh
index e149ac79..ba3e5c5f 100755
--- a/tests/command/t-test-1-indep-val.sh
+++ b/tests/command/t-test-1-indep-val.sh
@@ -6,10 +6,14 @@
 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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -17,6 +21,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -82,39 +90,38 @@ 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
 
 
 activity="compare output"
-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|
 #========#======#
 |INDEP   |F8.0  |
 |DEP     |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  Group Statistics
-#===========#==#====#==============#========#
-#     INDEP | N|Mean|Std. Deviation|SE. Mean#
-#===========#==#====#==============#========#
-#DEP < 1.514|11|8.00|         2.864|    .863#
-#    >=1.514|11|9.00|         3.821|   1.152#
-#===========#==#====#==============#========#
-
+#===========#==#====#==============#=========#
+#     INDEP | N|Mean|Std. Deviation|S.E. Mean#
+#===========#==#====#==============#=========#
+#DEP >=1.514|11|9.00|          3.82|     1.15#
+#    <1.514 |11|8.00|          2.86|      .86#
+#===========#==#====#==============#=========#
 2.2 T-TEST.  Independent Samples Test
-#==============================#=========#===============================================================================#
-#                              #Levene's |                          t-test for Equality of Means                         #
-#                              #----+----+-----+------+---------------+---------------+---------------------+------------#
-#                              #    |    |     |      |               |               |                     |    95%     #
-#                              #    |    |     |      |               |               |                     +------+-----#
-#                              #  F |Sig.|  t  |  df  |Sig. (2-tailed)|Mean Difference|Std. Error Difference| Lower|Upper#
-#==============================#====#====#=====#======#===============#===============#=====================#======#=====#
-#DEPEqual variances assumed    #.172|.683|-.695|    20|           .495|         -1.000|                1.440|-4.003|2.003#
-#   Equal variances not assumed#    |    |-.695|18.539|           .496|         -1.000|                1.440|-4.018|2.018#
-#==============================#====#====#=====#======#===============#===============#=====================#======#=====#
+#==============================#========#============================================================================#
+#                              #Levene's|                        t-test for Equality of Means                        #
+#                              #---+----+----+-----+---------------+---------------+---------------------+-----------#
+#                              #   |    |    |     |               |               |                     |    95%    #
+#                              #   |    |    |     |               |               |                     +-----+-----#
+#                              # F |Sig.|  t |  df |Sig. (2-tailed)|Mean Difference|Std. Error Difference|Lower|Upper#
+#==============================#===#====#====#=====#===============#===============#=====================#=====#=====#
+#DEPEqual variances assumed    #.17| .68|-.69|20.00|            .50|          -1.00|                 1.44|-4.00| 2.00#
+#   Equal variances not assumed#   |    |-.69|18.54|            .50|          -1.00|                 1.44|-4.02| 2.02#
+#==============================#===#====#====#=====#===============#===============#=====================#=====#=====#
 EOF
 if [ $? -ne 0 ] ; then fail ; fi