X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Ft-test-alpha3.sh;h=5504e6cc46fcab384954b550f2492d405d4fa307;hb=5f222ad4739550128ce5502b158763bba53bf9bb;hp=25bd11255526bf0e183063a9565dbf2d6fd11f38;hpb=91dc088ddff7486a9d7bdc397761f6b0bcecf41c;p=pspp

diff --git a/tests/bugs/t-test-alpha3.sh b/tests/bugs/t-test-alpha3.sh
index 25bd112555..5504e6cc46 100755
--- a/tests/bugs/t-test-alpha3.sh
+++ b/tests/bugs/t-test-alpha3.sh
@@ -27,6 +27,7 @@ cleanup()
 	echo "NOT cleaning $TEMPDIR"
      	return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -78,38 +79,28 @@ 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|
-#========#======#
-|x       |F8.0  |
-|gv      |A8    |
-+--------+------+
-2.1 T-TEST.  Group Statistics
-#==========#=#====#==============#========#
-#     gv   |N|Mean|Std. Deviation|SE. Mean#
-#==========#=#====#==============#========#
-#x One     |5|2.60|          .548|    .245#
-#  Two     |3|3.50|          .500|    .289#
-#==========#=#====#==============#========#
-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#
-#============================#=====#====#======#=====#===============#===============#=====================#======#=====#
-#xEqual variances assumed    #1.127|.329|-2.315|    6|           .060|          -.900|                 .379|-1.826| .026#
-# Equal variances not assumed#     |    |-2.377|4.699|           .067|          -.900|                 .379|-1.892| .092#
-#============================#=====#====#======#=====#===============#===============#=====================#======#=====#
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+x,F8.0
+gv,A8
+
+Table: Group Statistics
+,gv,N,Mean,Std. Deviation,S.E. Mean
+x,One     ,5,2.60,.55,.24
+,Two     ,3,3.50,.50,.29
+
+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
+x,Equal variances assumed,1.13,.33,-2.32,6.00,.06,-.90,.38,-1.83,.03
+,Equal variances not assumed,,,-2.38,4.70,.07,-.90,.38,-1.89,.09
 EOF
 if [ $? -ne 0 ] ; then fail ; fi