X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ft-test-1-indep-val.sh;h=ab2480518cbd9e4e578abffc246aa00523e6e3a2;hb=c360fff4fd3e4a98cfe02441f43c27725cead44b;hp=d1272a3db32e7dd3feccdfe3a344b3ee51da03bd;hpb=7fbfc32fc3c636959b0a25b3e76609f86519e84a;p=pspp

diff --git a/tests/command/t-test-1-indep-val.sh b/tests/command/t-test-1-indep-val.sh
index d1272a3db3..ab2480518c 100755
--- a/tests/command/t-test-1-indep-val.sh
+++ b/tests/command/t-test-1-indep-val.sh
@@ -10,7 +10,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`
@@ -90,38 +90,28 @@ 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|
-#========#======#
-|INDEP   |F8.0  |
-|DEP     |F8.0  |
-+--------+------+
-2.1 T-TEST.  Group Statistics
-#===========#==#====#==============#========#
-#     INDEP | N|Mean|Std. Deviation|SE. Mean#
-#===========#==#====#==============#========#
-#DEP >=1.514|11|9.00|          3.82|    1.15#
-#    <1.514 |11|8.00|          2.86|     .86#
-#===========#==#====#==============#========#
-2.2 T-TEST.  Independent Samples Test
-#==============================#========#============================================================================#
-#                              #Levene's|                        t-test for Equality of Means                        #
-#                              #---+----+----+-----+---------------+---------------+---------------------+-----------#
-#                              #   |    |    |     |               |               |                     |    95%    #
-#                              #   |    |    |     |               |               |                     +-----+-----#
-#                              # F |Sig.|  t |  df |Sig. (2-tailed)|Mean Difference|Std. Error Difference|Lower|Upper#
-#==============================#===#====#====#=====#===============#===============#=====================#=====#=====#
-#DEPEqual variances assumed    #.17| .68|-.69|20.00|            .50|          -1.00|                 1.44|-4.00| 2.00#
-#   Equal variances not assumed#   |    |-.69|18.54|            .50|          -1.00|                 1.44|-4.02| 2.02#
-#==============================#===#====#====#=====#===============#===============#=====================#=====#=====#
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+INDEP,F8.0
+DEP,F8.0
+
+Table: Group Statistics
+,INDEP,N,Mean,Std. Deviation,S.E. Mean
+DEP,>=1.514,11,9.00,3.82,1.15
+,<1.514,11,8.00,2.86,.86
+
+Table: Independent Samples Test
+,,Levene's Test for Equality of Variances,,t-test for Equality of Means,,,,,,
+,,,,,,,,,95% Confidence Interval of the Difference,
+,,F,Sig.,t,df,Sig. (2-tailed),Mean Difference,Std. Error Difference,Lower,Upper
+DEP,Equal variances assumed,.17,.68,-.69,20.00,.50,-1.00,1.44,-4.00,2.00
+,Equal variances not assumed,,,-.69,18.54,.50,-1.00,1.44,-4.02,2.02
 EOF
 if [ $? -ne 0 ] ; then fail ; fi