Greatly simplify PSPP configuration.

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

diff --git a/tests/bugs/html-frequency.sh b/tests/bugs/html-frequency.sh
index 9ef4a4af2ea6bc2caffbcdf64e49b69425f0a502..3417601ae41ab1808613fbe1beefd4f5e4453e93 100755 (executable)
--- a/tests/bugs/html-frequency.sh
+++ b/tests/bugs/html-frequency.sh
@@ -6,9 +6,27 @@
 
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
+
+# 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`
+
+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
 }
 
@@ -38,10 +56,9 @@ pass()
 
 mkdir -p $TEMPDIR
 
-here=`pwd`;
 
 activity="create data"
-cat << EOF > $TEMPDIR/ff.stat 
+cat << EOF > $TESTFILE
 
 data list free /v1 v2.
 begin data.
@@ -51,6 +68,8 @@ begin data.
 3 4
 end data.
 
+list.
+
 frequencies v1 v2.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
@@ -58,7 +77,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 cd $TEMPDIR
 
 activity="run data"
-$here/../src/pspp -o html $TEMPDIR/ff.stat
+$SUPERVISOR $PSPP -o pspp.html $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi