X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Foneway-with-splits.sh;h=7197a096f8ee59709e9ef7529ed7baec9c2bbf5d;hb=f828f7bf95a31e45cfee1ad6978d1ae3dff7f3c0;hp=8f2c24cca391c54b0886d41adafd6a60ee493036;hpb=d043fde2b737897e3372670afc47eb648c17624b;p=pspp-builds.git

diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh
index 8f2c24cc..7197a096 100755
--- a/tests/command/oneway-with-splits.sh
+++ b/tests/command/oneway-with-splits.sh
@@ -6,17 +6,27 @@
 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
-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()
 {
-     rm -rf $TEMPDIR
+    if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
+	echo Not cleaning $TEMPDIR;
+	return ; 
+    fi
+    cd /
+    rm -rf $TEMPDIR
 }
 
 
@@ -49,7 +59,7 @@ cd $TEMPDIR
 
 activity="create program"
 cat > $TESTFILE <<EOF
-DATA LIST LIST /quality * brand * s *.
+DATA LIST LIST /QUALITY * BRAND * S *.
 BEGIN DATA
 3 1 1
 2 1 1
@@ -78,19 +88,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 $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $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|
 #========#======#