Checkin of new directory structure.

[pspp-builds.git] / tests / command / loop.sh

diff --git a/tests/command/loop.sh b/tests/command/loop.sh
index 3fc5978874d7ed3fc6afffd6c07e8432f20bb204..56c536ac61c911deb88d96a25b3914f699ea4685 100755 (executable)
--- a/tests/command/loop.sh
+++ b/tests/command/loop.sh
@@ -5,16 +5,21 @@
 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`
 
 # 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()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -48,15 +53,15 @@ cd $TEMPDIR
 
 activity="create prog"
 cat > $TEMPDIR/loop.stat <<EOF
-data list /x 1 y 2 z 3.
+data list /X 1 Y 2 ZOOLOGICAL 3.
 begin data.
 125
 256
 397
 401
 end data.
-loop i=y to z by abs(z-y)/(z-y).
-print /x i.
+loop iterative_Variable=y to zoological by abs(zoological-y)/(zoological-y).
+print /x iterative_Variable.
 break.         /* Generates warning.
 end loop.
 execute.
@@ -64,25 +69,26 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TEMPDIR/loop.stat > $TEMPDIR/stdout
+$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TEMPDIR/loop.stat > $TEMPDIR/stdout
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare stdout"
-diff -B -b $TEMPDIR/stdout  - <<EOF
-$TEMPDIR/loop.stat:10: warning: BREAK: BREAK not enclosed in DO IF structure.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/stdout
+diff -b $TEMPDIR/stdout  - <<EOF
 EOF
 if [ $? -ne 0 ] ; then fail ; fi
 
 activity="compare results"
-diff -B -b $TEMPDIR/pspp.list  - <<EOF
-1.1 DATA LIST.  Reading 1 record from the command file.
-+--------+------+-------+------+
-|Variable|Record|Columns|Format|
-#========#======#=======#======#
-|X       |     1|  1-  1|F1.0  |
-|Y       |     1|  2-  2|F1.0  |
-|Z       |     1|  3-  3|F1.0  |
-+--------+------+-------+------+
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff  -b $TEMPDIR/pspp.list  - <<EOF
+1.1 DATA LIST.  Reading 1 record from INLINE.
++----------+------+-------+------+
+| Variable |Record|Columns|Format|
+#==========#======#=======#======#
+|X         |     1|  1-  1|F1.0  |
+|Y         |     1|  2-  2|F1.0  |
+|ZOOLOGICAL|     1|  3-  3|F1.0  |
++----------+------+-------+------+
 1     2.00 
 2     5.00 
 3     9.00