X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcompute-lv.sh;h=5bb132143755b36a7d19ab1e182a26eb86d14099;hb=432761249a7e96e81407a123d0e25c3de3066202;hp=6b7b70b1e85192f92f52835eae0580d63d50bb9b;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp-builds.git

diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh
index 6b7b70b1..5bb13214 100755
--- a/tests/bugs/compute-lv.sh
+++ b/tests/bugs/compute-lv.sh
@@ -9,6 +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
 
 # ensure that top_srcdir is absolute
 top_srcdir=`cd $top_srcdir; pwd`
@@ -19,6 +20,10 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo "NOT cleaning $TEMPDIR" 
+	return ; 
+     fi
      cd /
      rm -rf $TEMPDIR
 }
@@ -69,24 +74,21 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run prog"
-$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare output"
-perl -pi -e 's/^\s*$//g' pspp.list
-diff -b pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from INLINE.
-+----------------+------+
-|    Variable    |Format|
-#================#======#
-|longVariablename|F8.0  |
-|x               |F8.0  |
-+----------------+------+
-longVariablename        x
----------------- -------- 
-           99.00     2.00
-           97.00     4.00
+diff pspp.csv - << EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+longVariablename,F8.0
+x,F8.0
+
+Table: Data List
+longVariablename,x
+99.00,2.00
+97.00,4.00
 EOF
 if [ $? -ne 0 ] ; then fail ; fi