X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fnpar-sign.sh;h=6b85aef7e2bf889ebbf39632792921101c2aa901;hb=ca5f6bb9df6d4019d777b52da0419d917d4dfc52;hp=17c0c239985023f41d098e3e29596bc6956c01a8;hpb=b5c82cc9aabe7e641011130240ae1b2e84348e23;p=pspp-builds.git

diff --git a/tests/command/npar-sign.sh b/tests/command/npar-sign.sh
index 17c0c239..6b85aef7 100755
--- a/tests/command/npar-sign.sh
+++ b/tests/command/npar-sign.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
@@ -81,35 +81,27 @@ 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="compare output 1"
-diff - $TEMPDIR/pspp.list <<EOF
-1.1 NPAR TESTS.  Frequencies
-#=================================#=#
-#                                 |N#
-#---------------------------------+-#
-#height - age Negative Differences|1#
-#             Positive Differences|3#
-#             Ties                |2#
-#             Total               |6#
-#---------------------------------+-#
-#rank - heightNegative Differences|3#
-#             Positive Differences|2#
-#             Ties                |1#
-#             Total               |6#
-#=================================#=#
-
-1.2 NPAR TESTS.  Test Statistics
-#=====================#============#=============#
-#                     |height - age|rank - height#
-#=====================#============#=============#
-#Exact Sig. (2-tailed)|        .625|        1.000#
-#Exact Sig. (1-tailed)|        .312|         .500#
-#Point Probability    |        .250|         .312#
-#=====================#============#=============#
-
+diff -b -c - $TEMPDIR/pspp.csv <<EOF
+Table: Frequencies
+,,N
+height - age,Negative Differences,1
+,Positive Differences,3
+,Ties,2
+,Total,6
+rank - height,Negative Differences,3
+,Positive Differences,2
+,Ties,1
+,Total,6
+
+Table: Test Statistics
+,height - age,rank - height
+Exact Sig. (2-tailed),.625,1.000
+Exact Sig. (1-tailed),.312,.500
+Point Probability,.250,.312
 EOF
 if [ $? -ne 0 ] ; then fail ; fi