Add scratch file handles.

[pspp-builds.git] / tests / command / oneway-with-splits.sh

diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh
index f935343ed26ca49ec7e17c96734adc5083fb3509..da1d19cb38909d961b59b45e640f02269eec7b58 100755 (executable)
--- a/tests/command/oneway-with-splits.sh
+++ b/tests/command/oneway-with-splits.sh
@@ -4,18 +4,25 @@
 # when SPLIT FILE is active
 
 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()
 {
-     rm -rf $TEMPDIR
+    if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+       echo Not cleaning $TEMPDIR;
+       return ; 
+    fi
+    cd /
+    rm -rf $TEMPDIR
 }
 
 
@@ -47,8 +54,8 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
-DATA LIST LIST /quality * brand * s *.
+cat > $TESTFILE <<EOF
+DATA LIST LIST /QUALITY * BRAND * S *.
 BEGIN DATA
 3 1 1
 2 1 1
@@ -77,19 +84,20 @@ SPLIT FILE by s.
 ONEWAY
        quality BY brand
        /STATISTICS descriptives homogeneity
-       /CONTRASTS =  -2 2
-       /CONTRASTS = -1 1
+       /CONTRAST =  -2 2
+       /CONTRAST = -1 1
        .
 EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
-diff $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST.  Reading free-form data from the command file.
+perl -pi -e s/^\s*\$//g $TEMPDIR/pspp.list
+diff -b  $TEMPDIR/pspp.list - << EOF | perl -e 's/^\s*$//g'
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#