X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-pairs.sh;h=4dc40cd8b7ddfcc6f9511d406eb6d1563c9141db;hb=cef154921f6cdc07bc76edbe720036ab4c32bff8;hp=58f6f94739f6f590ceba9b01898ea1388aad7fde;hpb=a19e7749cdb8713316fde220f2fc9a5ad5dc79ed;p=pspp

diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index 58f6f94739..4dc40cd8b7 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
 }
 
@@ -47,8 +57,8 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
-data list list /id * a * b *.
+cat > $TESTFILE <<EOF
+data list list /ID * A * B *.
 begin data.
 1 2.0 3.0
 2 1.0 2.0
@@ -63,45 +73,31 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $PSPP -o pspp.csv $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.
-+--------+------+
-|Variable|Format|
-#========#======#
-|ID      |F8.0  |
-|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#
-#========#====#=#==============#========#
-
-2.2 T-TEST.  Paired Samples Correlations
-#======#=====#=#===========#====#
-#      |     #N|Correlation|Sig.#
-#======#=====#=#===========#====#
-#Pair 0|A & B#5|       .918|.028#
-#======#=====#=#===========#====#
-
-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#
-#===========#=======#==============#===============#=======#======#======#==#===============#
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+ID,F8.0
+A,F8.0
+B,F8.0
+
+Table: Paired Sample Statistics
+,,Mean,N,Std. Deviation,S.E. Mean
+Pair 0,A,2.00,5,.71,.32
+,B,4.00,5,1.54,.69
+
+Table: Paired Samples Correlations
+,,N,Correlation,Sig.
+Pair 0,A & B,5,.92,.03
+
+Table: Paired Samples Test
+,,Paired Differences,,,,,,,
+,,,,,95% Confidence Interval of the Difference,,,,
+,,Mean,Std. Deviation,Std. Error Mean,Lower,Upper,t,df,Sig. (2-tailed)
+Pair 0,A - B,-2.00,.94,.42,-3.16,-.84,-4.78,4,.01
 EOF
 if [ $? -ne 0 ] ; then fail ; fi