X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fnpar-wilcoxon.sh;h=8c349999f9bb06b82bb700ce3c0999919ae8b49e;hb=c360fff4fd3e4a98cfe02441f43c27725cead44b;hp=c4a5d825f4895daff1035d489daeb82e7b9a094c;hpb=015e221b0f8578afee769528572c76387f26c629;p=pspp

diff --git a/tests/command/npar-wilcoxon.sh b/tests/command/npar-wilcoxon.sh
index c4a5d825f4..8c349999f9 100755
--- a/tests/command/npar-wilcoxon.sh
+++ b/tests/command/npar-wilcoxon.sh
@@ -11,7 +11,7 @@ if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
 top_srcdir=`cd $top_srcdir; pwd`
 top_builddir=`cd $top_builddir; pwd`
 
-PSPP=$top_builddir/src/ui/terminal/pspp
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -59,7 +59,7 @@ cd $TEMPDIR
 
 activity="create program 1"
 cat > $TESTFILE <<  EOF
-data list notable list /foo * bar * w *.
+data list notable list /foo * bar * w (f8.0).
 begin data.
 1.00     1.00   1
 1.00     2.00   1
@@ -91,41 +91,34 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 1"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-
 activity="generate results"
-cat > $TEMPDIR/results.txt <<EOF
-1.1 NPAR TESTS.  Ranks
-#============================#==#=========#============#
-#                            # N|Mean Rank|Sum of Ranks#
-#============================#==#=========#============#
-#second - firstNegative Ranks# 5|     8.60|       43.00#
-#              Positive Ranks# 8|     6.00|       48.00#
-#              Ties          # 2|         |            #
-#              Total         #15|         |            #
-#============================#==#=========#============#
-
-1.2 NPAR TESTS.  Test Statistics
-#=====================#==============#
-#                     #second - first#
-#=====================#==============#
-#Z                    #         -.175#
-#Asymp. Sig (2-tailed)#          .861#
-#Exact Sig (2-tailed) #          .893#
-#Exact Sig (1-tailed) #          .446#
-#=====================#==============#
-
+cat > $TEMPDIR/results.csv <<EOF
+Table: Ranks
+,,N,Mean Rank,Sum of Ranks
+second - first,Negative Ranks,5,8.60,43.00
+,Positive Ranks,8,6.00,48.00
+,Ties,2,,
+,Total,15,,
+
+Table: Test Statistics
+,second - first
+Z,-.18
+Asymp. Sig. (2-tailed),.86
+Exact Sig. (2-tailed),.89
+Exact Sig. (1-tailed),.45
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output 1"
-diff pspp.list $TEMPDIR/results.txt
+diff -b -c pspp.csv $TEMPDIR/results.csv
 if [ $? -ne 0 ] ; then fail ; fi
 
 
+
 # No weights this time. But some missing values
 activity="create program 2"
 cat > $TESTFILE <<  EOF
@@ -161,12 +154,11 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program 2"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-
 activity="compare output 2"
-diff pspp.list $TEMPDIR/results.txt
+diff -b pspp.csv $TEMPDIR/results.csv
 if [ $? -ne 0 ] ; then fail ; fi