X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-pairs.sh;h=f657e8fb2cdb3259223603bbc8cb79d2f89d6cb4;hb=b9f6480f1b451cb7873bb0591369504ff1b92595;hp=34ac15e938377acc38af4f1482913b5f6dbc8f97;hpb=f4b04e8323d4c95c3723ca47587742e7175ae75f;p=pspp-builds.git

diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index 34ac15e9..f657e8fb 100755
--- a/tests/command/t-test-pairs.sh
+++ b/tests/command/t-test-pairs.sh
@@ -5,10 +5,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
@@ -65,13 +69,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"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
 diff  -b $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#
@@ -96,7 +100,7 @@ diff  -b $TEMPDIR/pspp.list - <<EOF
 #===========#=====================================================#======#==#===============#
 #           #                  Paired Differences                 |      |  |               #
 #           #-------+--------------+---------------+--------------+      |  |               #
-#           #       |              |               |     95%      |      |  |               #
+#           #       |              |               |95% Confidence|      |  |               #
 #           #       |              |               +-------+------+      |  |               #
 #           #  Mean |Std. Deviation|Std. Error Mean| Lower | Upper|   t  |df|Sig. (2-tailed)#
 #===========#=======#==============#===============#=======#======#======#==#===============#