FREQUENCIES: Modernize syntax and improve chart support.

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

diff --git a/tests/bugs/html-frequency.sh b/tests/bugs/html-frequency.sh
index e589c5171c2d84de20c9663411dea6c660ccbf33..3417601ae41ab1808613fbe1beefd4f5e4453e93 100755 (executable)
--- a/tests/bugs/html-frequency.sh
+++ b/tests/bugs/html-frequency.sh
@@ -12,6 +12,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
 cd $top_srcdir ; top_srcdir=`pwd`
@@ -21,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
 }
@@ -72,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 cd $TEMPDIR
 
 activity="run data"
-$SUPERVISOR $top_builddir/src/pspp -o html $TESTFILE
+$SUPERVISOR $PSPP -o pspp.html $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi