X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fcommand%2Froc2.sh;h=6cd9a44413e96dea1664951881fce93941dc5e9b;hb=21f2e65c7c2555bf5422920651eab07d1e8f5154;hp=ef3179fd92ad6b0d3d4c54e7a6fce35d4c453e56;hpb=d36d05a067ec2653a52e54bd61d21d8067c47be2;p=pspp

diff --git a/tests/command/roc2.sh b/tests/command/roc2.sh
index ef3179fd92..6cd9a44413 100755
--- a/tests/command/roc2.sh
+++ b/tests/command/roc2.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`
@@ -61,38 +61,62 @@ cd $TEMPDIR
 activity="create program"
 cat > $TESTFILE <<EOF
 set format F10.3.
-data list notable list /x * a *.
+data list notable list /x * a * comment (a20).
 begin data.
-0 1
-0 0
-1 1
-2 0
-3 1
-4 0
-4 1
-5 1
-6 0
-7 1
-8 0
-9 0
-9 1
+0  1 ""
+0  0 ""
+1  1 ""
+1  0 ""
+2  1 ""
+2  0 ""
+5  1 ""
+5  0 ""
+10 1 ""
+10 0 ""
+15 1 ""
+15 0 ""
+20 1 ""
+20 1 ""
+22 0 "here and"
+22 0 "here is the anomoly"
+25 1 ""
+25 0 ""
+30 1 ""
+30 0 ""
+35 1 ""
+35 0 ""
+38 1 ""
+38 0 ""
+39 1 ""
+39 0 ""
+40 1 ""
+40 0 ""
 end data.
 
 roc x by a (1)
-	/plot none
+	/plot = none
 	print = se 
 	.
 EOF
 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
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Case Summary
+,Valid N (listwise),
+a,Unweighted,Weighted
+Positive,14,14.000
+Negative,14,14.000
+
+Table: Area Under the Curve (x)
+,,,Asymp. 95% Confidence Interval,
+Area,Std. Error,Asymptotic Sig.,Lower Bound,Upper Bound
+.490,.111,.927,.307,.673
 EOF
 if [ $? -ne 0 ] ; then fail ; fi