Greatly simplify PSPP configuration.

[pspp] / tests / bugs / compute-lv.sh

diff --git a/tests/bugs/compute-lv.sh b/tests/bugs/compute-lv.sh
index e310cfb0dda67bafaad92721a4fa15f5904b6f0c..5bb132143755b36a7d19ab1e182a26eb86d14099 100755 (executable)
--- a/tests/bugs/compute-lv.sh
+++ b/tests/bugs/compute-lv.sh
@@ -5,10 +5,14 @@
 TEMPDIR=/tmp/pspp-tst-$$
 TESTFILE=$TEMPDIR/`basename $0`.sps
 
-here=`pwd`;
+# ensure that top_builddir  are absolute
+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
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -16,6 +20,11 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -65,24 +74,21 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run prog"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi
 
 
 activity="compare output"
-diff -B -b pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
-+----------------+------+
-|    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