X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fexamine-extremes.sh;h=cd0ad7ca6a01eb8cb13800a786ea5417b2ffd4a4;hb=5643b25173203af07925fdc4d12bda1f62769502;hp=6e789c7b25a0f6421796a252fa6b85a90fb85b7b;hpb=da299bd9871b178336a440c6ac53aebc3cea672e;p=pspp

diff --git a/tests/command/examine-extremes.sh b/tests/command/examine-extremes.sh
index 6e789c7b25..cd0ad7ca6a 100755
--- a/tests/command/examine-extremes.sh
+++ b/tests/command/examine-extremes.sh
@@ -9,7 +9,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`
@@ -95,40 +95,31 @@ 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 EXAMINE.  Case Processing Summary
-#==#=======================================#
-#  #                 Cases                 #
-#  #-------------+-----------+-------------#
-#  #    Valid    |  Missing  |    Total    #
-#  #-----+-------+---+-------+-----+-------#
-#  #  N  |Percent| N |Percent|  N  |Percent#
-#==#=====#=======#===#=======#=====#=======#
-#V1#23.00|   100%|.00|     0%|23.00|   100%#
-#==#=====#=======#===#=======#=====#=======#
-1.2 EXAMINE.  Extreme Values
-#============#===========#========#
-#            #Case Number|  Value #
-#============#===========#========#
-#V1 Highest 1#         21|   20.00#
-#           2#         20|   19.00#
-#           3#         19|   18.00#
-#           4#         19|   18.00#
-#           5#         18|   17.00#
-#           6#         17|   16.00#
-#  ----------#-----------+--------#
-#    Lowest 1#          1|    1.00#
-#           2#          2|    2.00#
-#           3#          4|    3.00#
-#           4#          3|    3.00#
-#           5#          3|    3.00#
-#           6#          5|    4.00#
-#============#===========#========#
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Case Processing Summary
+,Cases,,,,,
+,Valid,,Missing,,Total,
+,N,Percent,N,Percent,N,Percent
+V1,23.00,100%,.00,0%,23.00,100%
+
+Table: Extreme Values
+,,,Case Number,Value
+V1,Highest,1,21,20.00
+,,2,20,19.00
+,,3,19,18.00
+,,4,19,18.00
+,,5,18,17.00
+,,6,17,16.00
+,Lowest,1,1,1.00
+,,2,2,2.00
+,,3,3,3.00
+,,4,3,3.00
+,,5,4,3.00
+,,6,5,4.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi