Greatly simplify PSPP configuration.

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

diff --git a/tests/bugs/double-frequency.sh b/tests/bugs/double-frequency.sh
index 3104e36abff5da1b7ccb7973033bac2f6bf5580d..c579cf36b3c626b6ab3061da5c4618560626cbe1 100755 (executable)
--- a/tests/bugs/double-frequency.sh
+++ b/tests/bugs/double-frequency.sh
@@ -4,9 +4,29 @@
 # Commands existed in a input file
 
 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
+top_srcdir=`cd $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
 }
 
@@ -36,7 +56,6 @@ pass()
 
 mkdir -p $TEMPDIR
 
-here=`pwd`;
 
 activity="create data"
 cat << EOF > $TEMPDIR/ff.stat 
@@ -54,12 +73,11 @@ frequencies v1 v2.
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
-cd $top_srcdir; top_srcdir=`pwd`
 
 cd $TEMPDIR
 
 activity="run data"
-$here/../src/pspp -B $top_srcdir/config $TEMPDIR/ff.stat
+$SUPERVISOR $PSPP -o pspp.csv $TEMPDIR/ff.stat
 if [ $? -ne 0 ] ; then fail ; fi