X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-pairs.sh;h=f35157a3d55e378e64cfad55bc50d978b8ce00b4;hb=5424322a9f6fc37dfb09760c779a63460ecf7eb5;hp=37f833049b0842adb2d2fc83216c571070809d59;hpb=cb586666724d5fcbdb658ce471b85484f0a7babe;p=pspp

diff --git a/tests/command/t-test-pairs.sh b/tests/command/t-test-pairs.sh
index 37f833049b..f35157a3d5 100755
--- a/tests/command/t-test-pairs.sh
+++ b/tests/command/t-test-pairs.sh
@@ -9,7 +9,7 @@ TESTFILE=$TEMPDIR/`basename $0`.sps
 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
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -73,43 +73,31 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $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 INLINE.
-+--------+------+
-|Variable|Format|
-#========#======#
-|ID      |F8.0  |
-|A       |F8.0  |
-|B       |F8.0  |
-+--------+------+
-2.1 T-TEST.  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#
-#========#====#=#==============#=========#
-2.2 T-TEST.  Paired Samples Correlations
-#======#=====#=#===========#====#
-#      |     #N|Correlation|Sig.#
-#======#=====#=#===========#====#
-#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.00|           .94|            .42|-3.16| -.84|-4.78| 4|            .01#
-#===========#=====#==============#===============#=====#=====#=====#==#===============#
+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