projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid use of $* in Makefile since it's problematic
[pspp-builds.git]
/
tests
/
bugs
/
html-frequency.sh
diff --git
a/tests/bugs/html-frequency.sh
b/tests/bugs/html-frequency.sh
index ba000ee2efc9c9f7066d1d46f8b26b2c8bc24b8a..789fe32c74766ade1f606d060375ce049ba50858 100755
(executable)
--- a/
tests/bugs/html-frequency.sh
+++ b/
tests/bugs/html-frequency.sh
@@
-8,15
+8,25
@@
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
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`
STAT_CONFIG_PATH=$top_srcdir/config
# ensure that top_srcdir is absolute
cd $top_srcdir ; top_srcdir=`pwd`
STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-48,7
+58,7
@@
mkdir -p $TEMPDIR
activity="create data"
activity="create data"
-cat << EOF > $TE
MPDIR/ff.stat
+cat << EOF > $TE
STFILE
data list free /v1 v2.
begin data.
data list free /v1 v2.
begin data.
@@
-67,7
+77,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
cd $TEMPDIR
activity="run data"
cd $TEMPDIR
activity="run data"
-$SUPERVISOR $
here/../src/pspp -o html $TEMPDIR/ff.stat
+$SUPERVISOR $
PSPP -o html $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
if [ $? -ne 0 ] ; then fail ; fi