X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Foneway.sh;h=6245ec8fd28e3d7e2941efdfad5c3392a4b620c3;hb=5a33cc6d78fe87ff5e9bd32ea4af3f895e4ad2fc;hp=e81d8032910a25b7223853e10561b97e4dda2be6;hpb=2c9a5954d98d4dd508d8fbf2496f2bb819527a46;p=pspp

diff --git a/tests/command/oneway.sh b/tests/command/oneway.sh
index e81d803291..6245ec8fd2 100755
--- a/tests/command/oneway.sh
+++ b/tests/command/oneway.sh
@@ -3,6 +3,7 @@
 # This program tests that the ONEWAY anova command works OK
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -14,7 +15,11 @@ export STAT_CONFIG_PATH=$top_srcdir/config
 
 cleanup()
 {
-     rm -rf $TEMPDIR
+    if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo Not cleaning $TEMPDIR;
+	return ; 
+    fi
+    rm -rf $TEMPDIR
 }
 
 
@@ -46,8 +51,8 @@ mkdir -p $TEMPDIR
 cd $TEMPDIR
 
 activity="create program"
-cat > $TEMPDIR/out.stat <<EOF
-DATA LIST LIST /quality * brand * .
+cat > $TESTFILE <<EOF
+DATA LIST LIST /QUALITY * BRAND * .
 BEGIN DATA
 3 1
 2 1
@@ -74,18 +79,18 @@ VALUE LABELS /brand 1 'Aspeger' 2 'Bloggs' 3 'Charlies'.
 ONEWAY
 	quality BY brand
 	/STATISTICS descriptives homogeneity
-	/CONTRASTS =  -2 1 1 
-	/CONTRASTS = 0 -1 1
+	/CONTRAST =  -2 1 1 
+	/CONTRAST = 0 -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
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|