Greatly simplify PSPP configuration.

[pspp-builds.git] / tests / command / bignum.sh

diff --git a/tests/command/bignum.sh b/tests/command/bignum.sh
index a6465426e47ffaee83dc8daa59fdd74fc49ebc1f..8caa95c4908e4f296b6ce85d209cd8ee27332a21 100755 (executable)
--- a/tests/command/bignum.sh
+++ b/tests/command/bignum.sh
@@ -3,17 +3,28 @@
 # This program tests the use of big numbers
 
 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`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
+     if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo "NOT cleaning $TEMPDIR" 
+       return ; 
+     fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -114,7 +125,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="create program"
-cat > $TEMPDIR/prog.stat <<foobar
+cat > $TESTFILE <<foobar
 title 'Test use of big numbers'.
 
 *** Do the portable output.
@@ -127,7 +138,7 @@ foobar
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii prog.stat
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 # Like the above comments say ...