* command/print.sh: Get rid of RBHEX output. It wasn't worth much.

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

diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh
index 93acda68abb64ad972264c2e7a36198db350a845..3075467cbd114faf98ba6cb68114b6c40bee42a9 100755 (executable)
--- a/tests/command/oneway-with-splits.sh
+++ b/tests/command/oneway-with-splits.sh
@@ -4,6 +4,7 @@
 # when SPLIT FILE is active
 
 TEMPDIR=/tmp/pspp-tst-$$
+TESTFILE=$TEMPDIR/`basename $0`.sps
 
 here=`pwd`;
 
@@ -15,7 +16,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
 }
 
 
@@ -47,8 +52,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,18 +82,18 @@ 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
+diff -b -B $TEMPDIR/pspp.list - << EOF
 1.1 DATA LIST.  Reading free-form data from the command file.
 +--------+------+
 |Variable|Format|
@@ -166,7 +171,7 @@ S            2.00
 #===============#================#===#===#============#
 #               #Levene Statistic|df1|df2|Significance#
 #===============#================#===#===#============#
-#Breaking Strain#           2.199|  1|  6|        .189#
+#Breaking Strain#            .923|  1|  6|        .374#
 #===============#================#===#===#============#
 
 2.8 ONEWAY.  ANOVA