X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fhtml-frequency.sh;h=789fe32c74766ade1f606d060375ce049ba50858;hb=c55841266a4d42da7da89235aa54a7fa0ac488dc;hp=27b6f58a81547c42295c163e50d16b57ba30f6fe;hpb=fd02af47572a2325b4308477a6bd89950ed4d3b8;p=pspp-builds.git

diff --git a/tests/bugs/html-frequency.sh b/tests/bugs/html-frequency.sh
index 27b6f58a..789fe32c 100755
--- 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,15 +68,16 @@ begin data.
 3 4
 end data.
 
+list.
+
 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 -o html $TEMPDIR/ff.stat
+$SUPERVISOR $PSPP -o html $TESTFILE
 if [ $? -ne 0 ] ; then fail ; fi