Checkin of new directory structure.

[pspp-builds.git] / tests / command / beg-data.sh

diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh
index 66ef60cc043ecf57ce099db524ffd5771781329f..5def42a3051b0d8723f7a94491fb2e23d3e8fcbc 100755 (executable)
--- a/tests/command/beg-data.sh
+++ b/tests/command/beg-data.sh
@@ -5,10 +5,13 @@
 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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -16,6 +19,7 @@ export STAT_CONFIG_PATH
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -75,19 +79,19 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE
+$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare data"
-diff -b -B $TEMPDIR/pspp.list - << foobar
-1.1 DATA LIST.  Reading 1 record from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << foobar
+1.1 DATA LIST.  Reading 1 record from INLINE.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
 |A       |     1|  1-  1|F1.0  |
 |B       |     1|  2-  2|F1.0  |
 +--------+------+-------+------+
-
 A B
 - -
 1 2 
@@ -95,15 +99,13 @@ A B
 5 6 
 7 8 
 9 0 
-
-2.1 DATA LIST.  Reading 1 record from the command file.
+2.1 DATA LIST.  Reading 1 record from INLINE.
 +--------+------+-------+------+
 |Variable|Record|Columns|Format|
 #========#======#=======#======#
 |A       |     1|  1-  1|F1.0  |
 |B       |     1|  2-  2|F1.0  |
 +--------+------+-------+------+
-
 A B
 - -
 0 9