Greatly simplify PSPP configuration.

[pspp-builds.git] / tests / bugs / crosstabs.sh

diff --git a/tests/bugs/crosstabs.sh b/tests/bugs/crosstabs.sh
index 0125d7e7b14d1c9a6fd535291f1aa4d8fc36e073..6f02a5087ae4f9fdcabe2072814a4d6765142d02 100755 (executable)
--- a/tests/bugs/crosstabs.sh
+++ b/tests/bugs/crosstabs.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
 }
 
@@ -75,7 +84,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$SUPERVISOR $here/../src/pspp $TEMPDIR/ct.stat
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/ct.stat
 if [ $? -ne 0 ] ; then fail ; fi