X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fcommand%2Fprint.sh;h=9df49c13aabd59478cd75b058e666f5e5c6e72c8;hb=7d34380bb2fddca820a6f414564738cc2f70afc9;hp=8d7a6160a1d96ed752a633607aef2594f475cfb9;hpb=f5574c6264163859a8eb94ab1e33bcc1b61fce5f;p=pspp

diff --git a/tests/command/print.sh b/tests/command/print.sh
index 8d7a6160a1..9df49c13aa 100755
--- a/tests/command/print.sh
+++ b/tests/command/print.sh
@@ -24,7 +24,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`
@@ -37,6 +37,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -101,11 +105,11 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode -o raw-ascii --testing-mode --error-file=$TEMPDIR/errs $TEMPDIR/print.stat 
+$SUPERVISOR $PSPP -o pspp.csv --error-file=$TEMPDIR/errs $TEMPDIR/print.stat 
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare print.out"
-diff $TEMPDIR/print.out - <<EOF
+diff -b $TEMPDIR/print.out - <<EOF
  1 2 
 112
  1 -2 
@@ -130,7 +134,7 @@ EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare write.out"
-diff $TEMPDIR/write.out - <<EOF
+diff -b $TEMPDIR/write.out - <<EOF
 12
 12
 1-2
@@ -155,32 +159,56 @@ EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare output"
-diff $TEMPDIR/pspp.list - << EOF
+diff -b $TEMPDIR/pspp.csv - << EOF
 1 2 
 
+
+
 12
+
 1 -2 
 
+
+
 3 4 
 
+
+
 34
+
 3 -4 
 
+
+
 . 6 
 
+
+
 .6
+
 . -6 
 
+
+
 7 . 
 
+
+
 7.
+
 7 -. 
 
+
+
 9 0 
 
+
+
 90
+
 9 -0 
 
+
 EOF
 if [ $? -ne 0 ] ; then fail ; fi