Initial version

[pspp] / tests / command / erase.sh

diff --git a/tests/command/erase.sh b/tests/command/erase.sh
index d5f69102336df73925e1db958f89ba801221c9e8..1c010d8c0c3b441647325e79ffa1803fe0f3c028 100755 (executable)
--- a/tests/command/erase.sh
+++ b/tests/command/erase.sh
@@ -3,17 +3,20 @@
 # This program tests the ERASE command.
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
 # ensure that top_srcdir is absolute
 cd $top_srcdir; top_srcdir=`pwd`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -56,7 +59,7 @@ if [ ! -f $TEMPDIR/foobar ] ; then no_result ; fi
 
 
 activity="create program 1"
-cat > $TEMPDIR/foo.sps <<EOF
+cat > $TESTFILE <<EOF
 set safer on
 
 erase FILE='foobar'.
@@ -70,12 +73,12 @@ if [ ! -f $TEMPDIR/foobar ] ; then fail ; fi
 
 # This command must fail
 activity="run prog 1"
-$here/../src/pspp $TEMPDIR/foo.sps > /dev/null
+$SUPERVISOR $here/../src/pspp $TESTFILE > /dev/null
 if [ $? -eq 0 ] ; then fail ; fi
 
 
 activity="create program 2"
-cat > $TEMPDIR/foo.sps <<EOF
+cat > $TESTFILE <<EOF
 
 erase FILE='foobar'.
 
@@ -84,19 +87,11 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run prog 1"
-$here/../src/pspp $TEMPDIR/foo.sps
+$SUPERVISOR $here/../src/pspp $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
-
-
-
 pass;