X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Ftrimmed-mean.sh;h=1f3b01a18e543b264d1697e69cb9c2906cb13c06;hb=refs%2Fbuilds%2F20100922040502%2Fpspp;hp=660752dd914eda2d4146a9aea42ebc7695597515;hpb=7fbfc32fc3c636959b0a25b3e76609f86519e84a;p=pspp

diff --git a/tests/command/trimmed-mean.sh b/tests/command/trimmed-mean.sh
index 660752dd91..1f3b01a18e 100755
--- a/tests/command/trimmed-mean.sh
+++ b/tests/command/trimmed-mean.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`
@@ -81,48 +81,38 @@ 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 results"
-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  |
-|C       |F8.0  |
-+--------+------+
-2.1 EXAMINE.  Case Processing Summary
-#=#=======================================#
-# #                 Cases                 #
-# #-------------+-----------+-------------#
-# #    Valid    |  Missing  |    Total    #
-# #-----+-------+---+-------+-----+-------#
-# #  N  |Percent| N |Percent|  N  |Percent#
-#=#=====#=======#===#=======#=====#=======#
-#X#52.00|   100%|.00|     0%|52.00|   100%#
-#=#=====#=======#===#=======#=====#=======#
-2.2 EXAMINE.  Descriptives
-#==============================================#=========#==========#
-#                                              #Statistic|Std. Error#
-#==============================================#=========#==========#
-#X Mean                                        #   2.02  |    .03   #
-#  95% Confidence Interval for Mean Lower Bound#   1.95  |          #
-#                                   Upper Bound#   2.09  |          #
-#  5% Trimmed Mean                             #   2.00  |          #
-#  Median                                      #   2.00  |          #
-#  Variance                                    #   .06   |          #
-#  Std. Deviation                              #   .24   |          #
-#  Minimum                                     #   1.00  |          #
-#  Maximum                                     #   3.00  |          #
-#  Range                                       #   2.00  |          #
-#  Interquartile Range                         #   .00   |          #
-#  Skewness                                    #   1.19  |    .33   #
-#  Kurtosis                                    #  15.73  |    .65   #
-#==============================================#=========#==========#
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+X,F8.0
+C,F8.0
+
+Table: Case Processing Summary
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+X,52.00,100%,.00,0%,52.00,100%
+
+Table: Descriptives
+,,,Statistic,Std. Error
+X,Mean,,2.02,.03
+,95% Confidence Interval for Mean,Lower Bound,1.95,
+,,Upper Bound,2.09,
+,5% Trimmed Mean,,2.00,
+,Median,,2.00,
+,Variance,,.06,
+,Std. Deviation,,.24,
+,Minimum,,1.00,
+,Maximum,,3.00,
+,Range,,2.00,
+,Interquartile Range,,.00,
+,Skewness,,1.19,.33
+,Kurtosis,,15.73,.65
 EOF
 if [ $? -ne 0 ] ; then fail ; fi