X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-pairs.sh;h=37f833049b0842adb2d2fc83216c571070809d59;hb=cc3fd35c88509a6a3348a7a734d6d03b552d4589;hp=19793ebada79f843aa5a951c43ea24603ac57028;hpb=d043fde2b737897e3372670afc47eb648c17624b;p=pspp-builds.git

diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index 19793eba..37f83304 100755
--- a/tests/command/t-test-pairs.sh
+++ b/tests/command/t-test-pairs.sh
@@ -5,16 +5,26 @@
 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()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -48,7 +58,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE <<EOF
-data list list /id * a * b *.
+data list list /ID * A * B *.
 begin data.
 1 2.0 3.0
 2 1.0 2.0
@@ -63,12 +73,13 @@ 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|
 #========#======#
@@ -76,32 +87,29 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 |A       |F8.0  |
 |B       |F8.0  |
 +--------+------+
-
 2.1 T-TEST.  Paired Sample Statistics
-#========#====#=#==============#========#
-#        #Mean|N|Std. Deviation|SE. Mean#
-#========#====#=#==============#========#
-#Pair 0 A#2.00|5|          .707|    .316#
-#       B#4.00|5|         1.541|    .689#
-#========#====#=#==============#========#
-
+#========#====#=#==============#=========#
+#        #Mean|N|Std. Deviation|S.E. Mean#
+#========#====#=#==============#=========#
+#Pair 0 A#2.00|5|           .71|      .32#
+#       B#4.00|5|          1.54|      .69#
+#========#====#=#==============#=========#
 2.2 T-TEST.  Paired Samples Correlations
 #======#=====#=#===========#====#
 #      |     #N|Correlation|Sig.#
 #======#=====#=#===========#====#
-#Pair 0|A & B#5|       .918|.028#
+#Pair 0|A & B#5|        .92| .03#
 #======#=====#=#===========#====#
-
 2.3 T-TEST.  Paired Samples Test
-#===========#=====================================================#======#==#===============#
-#           #                  Paired Differences                 |      |  |               #
-#           #-------+--------------+---------------+--------------+      |  |               #
-#           #       |              |               |     95%      |      |  |               #
-#           #       |              |               +-------+------+      |  |               #
-#           #  Mean |Std. Deviation|Std. Error Mean| Lower | Upper|   t  |df|Sig. (2-tailed)#
-#===========#=======#==============#===============#=======#======#======#==#===============#
-#Pair 0A - B#-2.0000|        .93541|         .41833|-3.1615|-.8385|-4.781| 4|           .009#
-#===========#=======#==============#===============#=======#======#======#==#===============#
+#===========#================================================#=====#==#===============#
+#           #               Paired Differences               |     |  |               #
+#           #-----+--------------+---------------+-----------+     |  |               #
+#           #     |              |               |    95%    |     |  |               #
+#           #     |              |               +-----+-----+     |  |               #
+#           # Mean|Std. Deviation|Std. Error Mean|Lower|Upper|  t  |df|Sig. (2-tailed)#
+#===========#=====#==============#===============#=====#=====#=====#==#===============#
+#Pair 0A - B#-2.00|           .94|            .42|-3.16| -.84|-4.78| 4|            .01#
+#===========#=====#==============#===============#=====#=====#=====#==#===============#
 EOF
 if [ $? -ne 0 ] ; then fail ; fi