projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from branch interaction-review
[pspp-builds.git]
/
tests
/
command
/
erase.sh
diff --git
a/tests/command/erase.sh
b/tests/command/erase.sh
index d5f69102336df73925e1db958f89ba801221c9e8..491f79aa3bf4f96317b75769473c706bc8001509 100755
(executable)
--- a/
tests/command/erase.sh
+++ b/
tests/command/erase.sh
@@
-3,17
+3,28
@@
# This program tests the ERASE command.
TEMPDIR=/tmp/pspp-tst-$$
# This program tests the ERASE command.
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`
-export STAT_CONFIG_PATH=$top_srcdir/config
+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
}
@@
-56,7
+67,7
@@
if [ ! -f $TEMPDIR/foobar ] ; then no_result ; fi
activity="create program 1"
activity="create program 1"
-cat > $TE
MPDIR/foo.sps
<<EOF
+cat > $TE
STFILE
<<EOF
set safer on
erase FILE='foobar'.
set safer on
erase FILE='foobar'.
@@
-70,12
+81,12
@@
if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi
# This command must fail
activity="run prog 1"
# This command must fail
activity="run prog 1"
-$
here/../src/pspp $TEMPDIR/foo.sps > /dev/null
+$
SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE
if [ $? -eq 0 ] ; then fail ; fi
activity="create program 2"
if [ $? -eq 0 ] ; then fail ; fi
activity="create program 2"
-cat > $TE
MPDIR/foo.sps
<<EOF
+cat > $TE
STFILE
<<EOF
erase FILE='foobar'.
erase FILE='foobar'.
@@
-83,20
+94,12
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
-activity="run prog
1
"
-$
here/../src/pspp $TEMPDIR/foo.sps
+activity="run prog
2
"
+$
SUPERVISOR $PSPP --testing-mode $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
# foobar should now be gone
if [ -f $TEMPDIR/foobar ] ; then fail ; fi
if [ $? -ne 0 ] ; then fail ; fi
# foobar should now be gone
if [ -f $TEMPDIR/foobar ] ; then fail ; fi
-
-
-
-
-if [ $? -ne 0 ] ; then fail ; fi
-
-
-
pass;
pass;