Checkin of new directory structure.

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

diff --git a/tests/command/rename.sh b/tests/command/rename.sh
index c5d3ecfc4eaec05153aaaf725d8587ee6c59de16..5b94c91ffd699844ad692f2a46ba023017d8f9ab 100755 (executable)
--- a/tests/command/rename.sh
+++ b/tests/command/rename.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
@@ -70,7 +73,7 @@ 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="check sysfile"
@@ -78,29 +81,27 @@ grep -i Brake $TEMPDIR/rename.sav
 if [ $? -eq 0 ] ; then fail ; fi
 
 activity="compare output"
-diff -B -b $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
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +----------+------+
 | Variable |Format|
 #==========#======#
 |brakeFluid|F8.0  |
 |y         |F8.0  |
 +----------+------+
-
 brakeFluid        y
 ---------- --------
       1.00     3.00 
       2.00     3.00 
       3.00     3.00 
       4.00     3.00 
-
 applecarts        y
 ---------- --------
       1.00     3.00 
       2.00     3.00 
       3.00     3.00 
       4.00     3.00 
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi