X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fget-data-txt.sh;h=bc56081357598c75aacc709397d9f605a94367b2;hb=638a86001fe7a237bd6c19a181d796305290d72a;hp=68ee637d0fe4b73dd738c1b9075ea0a8c92b330d;hpb=2a2e0fe99b3bdf364bff6f0eb7a13ce40be9488c;p=pspp

diff --git a/tests/command/get-data-txt.sh b/tests/command/get-data-txt.sh
index 68ee637d0f..bc56081357 100755
--- a/tests/command/get-data-txt.sh
+++ b/tests/command/get-data-txt.sh
@@ -11,7 +11,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`
@@ -22,6 +22,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -148,56 +152,59 @@ 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 fail ; fi
 
 activity="compare output"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b  $TEMPDIR/pspp.list - << EOF
-       A        B        C        D
--------- -------- -------- --------
-    1.00    23.00    45.00     2.03
-    2.00    22.00    34.00    23.00
-    3.00    34.00    34.00    34.00
-       A        B        C        D
--------- -------- -------- --------
-     .       1.00     2.00     3.00
-     .       4.00      .       5.00
-    6.00     7.00      .       8.00
-    9.00      .00     1.00      .
-     .        .        .        .
-     .        .        .       2.00
-     .       3.00     4.00     5.00
-       A        B        C        D
--------- -------- -------- --------
-    1.00     2.00     3.00     4.00
-    1.00     2.00     3.00      .
-    1.00     2.00      .       4.00
-    1.00     2.00      .        .
-    1.00      .       3.00     4.00
-    1.00      .       3.00      .
-    1.00      .        .       4.00
-    1.00      .        .        .
-     .       2.00     3.00     4.00
-     .       2.00     3.00      .
-     .       2.00      .       4.00
-     .       2.00      .        .
-     .        .       3.00     4.00
-     .        .       3.00      .
-     .        .        .       4.00
-     .        .        .        .
-               start                  end count
--------------------- -------------------- -----
-          07/22/2007           10/06/2007   321
-          07/14/1789           08/26/1789     4
-          01/01/1972           12/31/1999   682
-x y
-- -
-1 2
-3 4
-5 6
-7 8
-9 0
+diff -b  $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+A,B,C,D
+1.00,23.00,45.00,2.03
+2.00,22.00,34.00,23.00
+3.00,34.00,34.00,34.00
+
+Table: Data List
+A,B,C,D
+.  ,1.00,2.00,3.00
+.  ,4.00,.  ,5.00
+6.00,7.00,.  ,8.00
+9.00,.00,1.00,.
+.  ,.  ,.  ,.
+.  ,.  ,.  ,2.00
+.  ,3.00,4.00,5.00
+
+Table: Data List
+A,B,C,D
+1.00,2.00,3.00,4.00
+1.00,2.00,3.00,.
+1.00,2.00,.  ,4.00
+1.00,2.00,.  ,.
+1.00,.  ,3.00,4.00
+1.00,.  ,3.00,.
+1.00,.  ,.  ,4.00
+1.00,.  ,.  ,.
+.  ,2.00,3.00,4.00
+.  ,2.00,3.00,.
+.  ,2.00,.  ,4.00
+.  ,2.00,.  ,.
+.  ,.  ,3.00,4.00
+.  ,.  ,3.00,.
+.  ,.  ,.  ,4.00
+.  ,.  ,.  ,.
+
+Table: Data List
+start,end,count
+07/22/2007,10/06/2007,321
+07/14/1789,08/26/1789,4
+01/01/1972,12/31/1999,682
+
+Table: Data List
+x,y
+1,2
+3,4
+5,6
+7,8
+9,0
 EOF
 if [ $? -ne 0 ] ; then fail ; fi