FREQUENCIES: Modernize syntax and improve chart support.

[pspp] / tests / bugs / double-frequency.sh

diff --git a/tests/bugs/double-frequency.sh b/tests/bugs/double-frequency.sh
index c97521ba2c671e031bfd403cc6a0907ec357ea72..c579cf36b3c626b6ab3061da5c4618560626cbe1 100755 (executable)
--- a/tests/bugs/double-frequency.sh
+++ b/tests/bugs/double-frequency.sh
@@ -6,10 +6,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
@@ -18,6 +22,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,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 cd $TEMPDIR
 
 activity="run data"
-$SUPERVISOR $here/../src/pspp  $TEMPDIR/ff.stat
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/ff.stat
 if [ $? -ne 0 ] ; then fail ; fi