X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Ft-test-alpha.sh;h=a6fd5d9b44ea738c8f526d984f6ba90dc98d65e8;hb=608b1765241e7c6f9bd5e86a8f81cf15edeb413b;hp=7a614b091787b427776fcdbd4c7250ee05c35402;hpb=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp

diff --git a/tests/bugs/t-test-alpha.sh b/tests/bugs/t-test-alpha.sh
index 7a614b0917..a6fd5d9b44 100755
--- a/tests/bugs/t-test-alpha.sh
+++ b/tests/bugs/t-test-alpha.sh
@@ -11,7 +11,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`
@@ -82,43 +82,33 @@ 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  |
-|INDEP   |A1    |
-|DEP1    |F8.0  |
-|DEP2    |F8.0  |
-+--------+------+
-2.1 T-TEST.  Group Statistics
-#==========#=#====#==============#========#
-#     INDEP|N|Mean|Std. Deviation|SE. Mean#
-#==========#=#====#==============#========#
-#DEP1 a    |5|2.00|           .71|     .32#
-#     b    |5|4.00|           .71|     .32#
-#DEP2 a    |5|4.00|           .71|     .32#
-#     b    |5|2.00|           .71|     .32#
-#==========#=#====#==============#========#
-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#
-#===============================#===#====#=====#====#===============#===============#=====================#=====#=====#
-#DEP1Equal variances assumed    #.00|1.00|-4.47|8.00|            .00|          -2.00|                  .45|-3.03| -.97#
-#    Equal variances not assumed#   |    |-4.47|8.00|            .00|          -2.00|                  .45|-3.03| -.97#
-#DEP2Equal variances assumed    #.00|1.00| 4.47|8.00|            .00|           2.00|                  .45|  .97| 3.03#
-#    Equal variances not assumed#   |    | 4.47|8.00|            .00|           2.00|                  .45|  .97| 3.03#
-#===============================#===#====#=====#====#===============#===============#=====================#=====#=====#
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+ID,F8.0
+INDEP,A1
+DEP1,F8.0
+DEP2,F8.0
+
+Table: Group Statistics
+,INDEP,N,Mean,Std. Deviation,S.E. Mean
+DEP1,a,5,2.00,.71,.32
+,b,5,4.00,.71,.32
+DEP2,a,5,4.00,.71,.32
+,b,5,2.00,.71,.32
+
+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
+DEP1,Equal variances assumed,.00,1.00,-4.47,8.00,.00,-2.00,.45,-3.03,-.97
+,Equal variances not assumed,,,-4.47,8.00,.00,-2.00,.45,-3.03,-.97
+DEP2,Equal variances assumed,.00,1.00,4.47,8.00,.00,2.00,.45,.97,3.03
+,Equal variances not assumed,,,4.47,8.00,.00,2.00,.45,.97,3.03
 EOF
 if [ $? -ne 0 ] ; then fail ; fi