X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Ft-test-paired.sh;h=29c556a530622d94d33026d0d8d97108f66f33a9;hb=7c6e9646a94126a410fab4d00714396b98923230;hp=f722f614fcbd9042e1b5fae340fc69ceacba17cf;hpb=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp

diff --git a/tests/bugs/t-test-paired.sh b/tests/bugs/t-test-paired.sh
index f722f614fc..29c556a530 100755
--- a/tests/bugs/t-test-paired.sh
+++ b/tests/bugs/t-test-paired.sh
@@ -12,7 +12,7 @@ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
 top_srcdir=`cd $top_srcdir; pwd`
 top_builddir=`cd $top_builddir; pwd`
 
-PSPP=$top_builddir/src/ui/terminal/pspp
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -73,43 +73,31 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $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|
-#========#======#
-|A       |F8.0  |
-|B       |F8.0  |
-+--------+------+
-2.1 T-TEST.  Paired Sample Statistics
-#========#=====#=#==============#========#
-#        # Mean|N|Std. Deviation|SE. Mean#
-#========#=====#=#==============#========#
-#Pair 0 A#4.333|3|         5.774|   3.333#
-#       B#1.333|3|          .577|    .333#
-#========#=====#=#==============#========#
-2.2 T-TEST.  Paired Samples Correlations
-#======#=====#=#===========#====#
-#      |     #N|Correlation|Sig.#
-#======#=====#=#===========#====#
-#Pair 0|A & B#3|      1.000|.000#
-#======#=====#=#===========#====#
-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#3.000|         5.196|          3.000|-9.908|15.908|1.000| 2|           .423#
-#===========#=====#==============#===============#======#======#=====#==#===============#
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+A,F8.0
+B,F8.0
+
+Table: Paired Sample Statistics
+,,Mean,N,Std. Deviation,S.E. Mean
+Pair 0,A,4.333,3,5.774,3.333
+,B,1.333,3,.577,.333
+
+Table: Paired Samples Correlations
+,,N,Correlation,Sig.
+Pair 0,A & B,3,1.000,.000
+
+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,3.000,5.196,3.000,-9.908,15.908,1.000,2,.423
 EOF
 if [ $? -ne 0 ] ; then fail ; fi