X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fvector.sh;h=c5d41841bfe3164724839425cb64d4f4a5a136d1;hb=a7b5ed72c52e462c75a2fed485ed65aaf09a1d39;hp=94c0c4693cb2c7dabb0bef63739c9dd7fbda7f59;hpb=9aff19b717bcc242e16d04c34f348fd79ebdd685;p=pspp

diff --git a/tests/command/vector.sh b/tests/command/vector.sh
index 94c0c4693c..c5d41841bf 100755
--- a/tests/command/vector.sh
+++ b/tests/command/vector.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`
@@ -23,6 +23,10 @@ export LANG
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -80,7 +84,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $PSPP --testing-mode -e $TEMPDIR/stdout $TEMPDIR/vector.stat
+$SUPERVISOR $PSPP -o pspp.csv -e $TEMPDIR/stdout $TEMPDIR/vector.stat
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare stdout"
@@ -90,61 +94,47 @@ EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare results"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff  -b $TEMPDIR/pspp.list  - <<EOF
-+------+--------+--------+------------+
-|Vector|Position|Variable|Print Format|
-#======#========#========#============#
-|v     |       1|v1      |F8.2        |
-|      |       2|v2      |F8.2        |
-|      |       3|v3      |F8.2        |
-|      |       4|v4      |F8.2        |
-+------+--------+--------+------------+
-+------+--------+--------+------------+
-|Vector|Position|Variable|Print Format|
-#======#========#========#============#
-|#vec  |       1|#vec1   |COMMA10.2   |
-|      |       2|#vec2   |COMMA10.2   |
-|      |       3|#vec3   |COMMA10.2   |
-|      |       4|#vec4   |COMMA10.2   |
-+------+--------+--------+------------+
-1.1 DATA LIST.  Reading 1 record from INLINE.
-+--------+------+-------+------+
-|Variable|Record|Columns|Format|
-#========#======#=======#======#
-|x5      |     1|  1-  1|F1.0  |
-|x2      |     1|  2-  2|F1.0  |
-|x3      |     1|  3-  3|F1.0  |
-|x1      |     1|  4-  4|F1.0  |
-|x4      |     1|  5-  5|F1.0  |
-+--------+------+-------+------+
-+------+--------+--------+------------+
-|Vector|Position|Variable|Print Format|
-#======#========#========#============#
-|x     |       1|x1      |F8.2        |
-|      |       2|x2      |F8.2        |
-|      |       3|x3      |F8.2        |
-|      |       4|x4      |F8.2        |
-|      |       5|x5      |F8.2        |
-+------+--------+--------+------------+
-+------+--------+--------+------------+
-|Vector|Position|Variable|Print Format|
-#======#========#========#============#
-|a     |       1|u       |F1.0        |
-|      |       2|w       |F1.0        |
-|      |       3|x       |F1.0        |
-|      |       4|y       |F1.0        |
-+------+--------+--------+------------+
-|b     |       1|x       |F1.0        |
-|      |       2|y       |F1.0        |
-|      |       3|z       |F1.0        |
-+------+--------+--------+------------+
-|c     |       1|u       |F1.0        |
-|      |       2|w       |F1.0        |
-|      |       3|x       |F1.0        |
-|      |       4|y       |F1.0        |
-|      |       5|z       |F1.0        |
-+------+--------+--------+------------+
+diff -c $TEMPDIR/pspp.csv  - <<EOF
+Vector,Position,Variable,Print Format
+v,1,v1,F8.2
+,2,v2,F8.2
+,3,v3,F8.2
+,4,v4,F8.2
+
+Vector,Position,Variable,Print Format
+#vec,1,#vec1,COMMA10.2
+,2,#vec2,COMMA10.2
+,3,#vec3,COMMA10.2
+,4,#vec4,COMMA10.2
+
+Table: Reading 1 record from INLINE.
+Variable,Record,Columns,Format
+x5,1,1-  1,F1.0
+x2,1,2-  2,F1.0
+x3,1,3-  3,F1.0
+x1,1,4-  4,F1.0
+x4,1,5-  5,F1.0
+
+Vector,Position,Variable,Print Format
+x,1,x1,F8.2
+,2,x2,F8.2
+,3,x3,F8.2
+,4,x4,F8.2
+,5,x5,F8.2
+
+Vector,Position,Variable,Print Format
+a,1,u,F1.0
+,2,w,F1.0
+,3,x,F1.0
+,4,y,F1.0
+b,1,x,F1.0
+,2,y,F1.0
+,3,z,F1.0
+c,1,u,F1.0
+,2,w,F1.0
+,3,x,F1.0
+,4,y,F1.0
+,5,z,F1.0
 EOF
 if [ $? -ne 0 ] ; then fail ; fi