X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fstats%2Fpercentiles-enhanced.sh;h=c69bacd85f53081b484f17154b1ff378a0286503;hb=d6850d8b37aed424e3d35ca1439243220678b72a;hp=9ee5a8c9b7d084a74055e099afc61a97e457db5f;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp-builds.git

diff --git a/tests/stats/percentiles-enhanced.sh b/tests/stats/percentiles-enhanced.sh
index 9ee5a8c9..c69bacd8 100755
--- a/tests/stats/percentiles-enhanced.sh
+++ b/tests/stats/percentiles-enhanced.sh
@@ -9,7 +9,7 @@ TEMPDIR=/tmp/pspp-tst-$$
 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,37 +81,32 @@ EOF
 if [ $? -ne 0 ] ; then no_result; fi
 
 activity="run program $i"
-$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF
-1.1 FREQUENCIES.  X
-+-----------+--------+---------+--------+-------------+-----------+
-|Value Label|  Value |Frequency| Percent|Valid Percent|Cum Percent|
-#===========#========#=========#========#=============#===========#
-|           |    1.00|        1|   20.00|        20.00|      20.00|
-|           |    2.00|        1|   20.00|        20.00|      40.00|
-|           |    3.00|        1|   20.00|        20.00|      60.00|
-|           |    4.00|        1|   20.00|        20.00|      80.00|
-|           |    5.00|        1|   20.00|        20.00|     100.00|
-#===========#========#=========#========#=============#===========#
-|               Total|        5|   100.0|        100.0|           |
-+--------------------+---------+--------+-------------+-----------+
-+-----------------------+----+
-|N           Valid      |   5|
-|            Missing    |   0|
-|Mean                   |3.00|
-|Std Dev                |1.58|
-|Minimum                |1.00|
-|Maximum                |5.00|
-|Percentiles 0          |1.00|
-|            25         |2.00|
-|            50 (Median)|3.00|
-|            75         |4.00|
-|            100        |5.00|
-+-----------------------+----+
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: X
+Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
+,1.00,1,20.00,20.00,20.00
+,2.00,1,20.00,20.00,40.00
+,3.00,1,20.00,20.00,60.00
+,4.00,1,20.00,20.00,80.00
+,5.00,1,20.00,20.00,100.00
+Total,,5,100.0,100.0,
+
+Table: X
+N,Valid,5
+,Missing,0
+Mean,,3.00
+Std Dev,,1.58
+Minimum,,1.00
+Maximum,,5.00
+Percentiles,0,1.00
+,25,2.00
+,50 (Median),3.00
+,75,4.00
+,100,5.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -143,37 +138,32 @@ if [ $? -ne 0 ] ; then no_result; fi
 
 
 activity="run program $i"
-$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF
-1.1 FREQUENCIES.  X
-+-----------+--------+---------+--------+-------------+-----------+
-|Value Label|  Value |Frequency| Percent|Valid Percent|Cum Percent|
-#===========#========#=========#========#=============#===========#
-|           |    1.00|     2.00|   20.00|        20.00|      20.00|
-|           |    2.00|     2.00|   20.00|        20.00|      40.00|
-|           |    3.00|     2.00|   20.00|        20.00|      60.00|
-|           |    4.00|     2.00|   20.00|        20.00|      80.00|
-|           |    5.00|     2.00|   20.00|        20.00|     100.00|
-#===========#========#=========#========#=============#===========#
-|               Total|    10.00|   100.0|        100.0|           |
-+--------------------+---------+--------+-------------+-----------+
-+-----------------------+-----+
-|N           Valid      |10.00|
-|            Missing    |  .00|
-|Mean                   | 3.00|
-|Std Dev                | 1.49|
-|Minimum                | 1.00|
-|Maximum                | 5.00|
-|Percentiles 0          | 1.00|
-|            25         | 2.00|
-|            50 (Median)| 3.00|
-|            75         | 4.00|
-|            100        | 5.00|
-+-----------------------+-----+
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: X
+Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
+,1.00,2.00,20.00,20.00,20.00
+,2.00,2.00,20.00,20.00,40.00
+,3.00,2.00,20.00,20.00,60.00
+,4.00,2.00,20.00,20.00,80.00
+,5.00,2.00,20.00,20.00,100.00
+Total,,10.00,100.0,100.0,
+
+Table: X
+N,Valid,10.00
+,Missing,.00
+Mean,,3.00
+Std Dev,,1.49
+Minimum,,1.00
+Maximum,,5.00
+Percentiles,0,1.00
+,25,2.00
+,50 (Median),3.00
+,75,4.00
+,100,5.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -203,36 +193,31 @@ if [ $? -ne 0 ] ; then no_result; fi
 
 
 activity="run program $i"
-$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list - <<EOF
-1.1 FREQUENCIES.  X
-+-----------+--------+---------+--------+-------------+-----------+
-|Value Label|  Value |Frequency| Percent|Valid Percent|Cum Percent|
-#===========#========#=========#========#=============#===========#
-|           |    1.00|     1.00|   16.67|        16.67|      16.67|
-|           |    3.00|     2.00|   33.33|        33.33|      50.00|
-|           |    4.00|     1.00|   16.67|        16.67|      66.67|
-|           |    5.00|     2.00|   33.33|        33.33|     100.00|
-#===========#========#=========#========#=============#===========#
-|               Total|     6.00|   100.0|        100.0|           |
-+--------------------+---------+--------+-------------+-----------+
-+-----------------------+----+
-|N           Valid      |6.00|
-|            Missing    | .00|
-|Mean                   |3.50|
-|Std Dev                |1.52|
-|Minimum                |1.00|
-|Maximum                |5.00|
-|Percentiles 0          |1.00|
-|            25         |3.00|
-|            50 (Median)|3.50|
-|            75         |4.75|
-|            100        |5.00|
-+-----------------------+----+
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: X
+Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
+,1.00,1.00,16.67,16.67,16.67
+,3.00,2.00,33.33,33.33,50.00
+,4.00,1.00,16.67,16.67,66.67
+,5.00,2.00,33.33,33.33,100.00
+Total,,6.00,100.0,100.0,
+
+Table: X
+N,Valid,6.00
+,Missing,.00
+Mean,,3.50
+Std Dev,,1.52
+Minimum,,1.00
+Maximum,,5.00
+Percentiles,0,1.00
+,25,3.00
+,50 (Median),3.50
+,75,4.75
+,100,5.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
@@ -262,37 +247,32 @@ if [ $? -ne 0 ] ; then no_result; fi
 
 
 activity="run program $i"
-$SUPERVISOR $PSPP --testing-mode $TEMPDIR/prog.sps
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/prog.sps
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare output $i"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - <<EOF
-1.1 FREQUENCIES.  X
-+-----------+--------+---------+--------+-------------+-----------+
-|Value Label|  Value |Frequency| Percent|Valid Percent|Cum Percent|
-#===========#========#=========#========#=============#===========#
-|           |    1.00|     1.00|   10.00|        16.67|      16.67|
-|           |    3.00|     2.00|   20.00|        33.33|      50.00|
-|           |    4.00|     1.00|   10.00|        16.67|      66.67|
-|           |    5.00|     2.00|   20.00|        33.33|     100.00|
-|           |   99.00|     4.00|   40.00|      Missing|           |
-#===========#========#=========#========#=============#===========#
-|               Total|    10.00|   100.0|        100.0|           |
-+--------------------+---------+--------+-------------+-----------+
-+-----------------------+----+
-|N           Valid      |6.00|
-|            Missing    |4.00|
-|Mean                   |3.50|
-|Std Dev                |1.52|
-|Minimum                |1.00|
-|Maximum                |5.00|
-|Percentiles 0          |1.00|
-|            25         |3.00|
-|            50 (Median)|3.50|
-|            75         |4.75|
-|            100        |5.00|
-+-----------------------+----+
+diff -c $TEMPDIR/pspp.csv - <<EOF
+Table: X
+Value Label,Value,Frequency,Percent,Valid Percent,Cum Percent
+,1.00,1.00,10.00,16.67,16.67
+,3.00,2.00,20.00,33.33,50.00
+,4.00,1.00,10.00,16.67,66.67
+,5.00,2.00,20.00,33.33,100.00
+,99.00,4.00,40.00,Missing,
+Total,,10.00,100.0,100.0,
+
+Table: X
+N,Valid,6.00
+,Missing,4.00
+Mean,,3.50
+Std Dev,,1.52
+Minimum,,1.00
+Maximum,,5.00
+Percentiles,0,1.00
+,25,3.00
+,50 (Median),3.50
+,75,4.75
+,100,5.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi