projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Fix vertical alignment of text to a baseline in chart output.
[pspp-builds.git]
/
tests
/
command
/
erase.sh
diff --git
a/tests/command/erase.sh
b/tests/command/erase.sh
index 1c010d8c0c3b441647325e79ffa1803fe0f3c028..491f79aa3bf4f96317b75769473c706bc8001509 100755
(executable)
--- a/
tests/command/erase.sh
+++ b/
tests/command/erase.sh
@@
-5,10
+5,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
@@
-16,6
+20,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
}
@@
-73,7
+81,7
@@
if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi
# This command must fail
activity="run prog 1"
# This command must fail
activity="run prog 1"
-$SUPERVISOR $
here/../src/pspp $TESTFILE > /dev/null
+$SUPERVISOR $
PSPP --testing-mode -e /dev/null $TESTFILE
if [ $? -eq 0 ] ; then fail ; fi
if [ $? -eq 0 ] ; then fail ; fi
@@
-86,8
+94,8
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
-activity="run prog
1
"
-$SUPERVISOR $
here/../src/pspp
$TESTFILE
+activity="run prog
2
"
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
# foobar should now be gone
if [ $? -ne 0 ] ; then fail ; fi
# foobar should now be gone