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
/
get-no-file.sh
diff --git
a/tests/bugs/get-no-file.sh
b/tests/bugs/get-no-file.sh
index b9da9fa1afb1da51c48de347b23a771350cbb249..d047b76758a332ff398ab56ecc5d65c2d4f80c19 100755
(executable)
--- a/
tests/bugs/get-no-file.sh
+++ b/
tests/bugs/get-no-file.sh
@@
-6,10
+6,14
@@
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
# ensure that top_srcdir is absolute
-
cd $top_srcdir; top_srcdir=`
pwd`
+
top_srcdir=`cd $top_srcdir;
pwd`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-17,6
+21,10
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
cd /
rm -rf $TEMPDIR
}
@@
-60,7
+68,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
# We use the stdinput here, because the bug seems to manifest itself only in
# interactive mode.
activity="run program"
# We use the stdinput here, because the bug seems to manifest itself only in
# interactive mode.
activity="run program"
-cat $TESTFILE | $SUPERVISOR $
here/../src/pspp -o raw-ascii
> /dev/null
+cat $TESTFILE | $SUPERVISOR $
PSPP --testing-mode
> /dev/null
if [ $? -ne 0 ] ; then fail ; fi
pass
if [ $? -ne 0 ] ; then fail ; fi
pass