Checkin of new directory structure.

[pspp] / tests / command / longvars.sh

diff --git a/tests/command/longvars.sh b/tests/command/longvars.sh
index 063ad6bb82df935324c124bb1170f0f5f3430f7b..d448bffb0425c03b09f488528c4709935c06f697 100755 (executable)
--- a/tests/command/longvars.sh
+++ b/tests/command/longvars.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
@@ -67,12 +70,13 @@ 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 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|
 #==============#======#
@@ -81,11 +85,9 @@ diff -B -b $TEMPDIR/pspp.list - <<EOF
 |X             |F8.0  |
 |Yabbadabbadoo |F8.0  |
 +--------------+------+
-
 AlphaBetaGamma        B        X Yabbadabbadoo
 -------------- -------- -------- -------------
           2.00     3.00     4.00          5.00 
-
 2.1 CROSSTABS.  Summary.
 #===============#=====================================================#
 #               #                        Cases                        #
@@ -97,7 +99,6 @@ AlphaBetaGamma        B        X Yabbadabbadoo
 #X *            #       1|  100.0%|       0|    0.0%|       1|  100.0%#
 #Yabbadabbadoo  #        |        |        |        |        |        #
 #===============#========#========#========#========#========#========#
-
 2.2 CROSSTABS.  X by Yabbadabbadoo [count].
 #===============#==============================================================#========#
 #               #                         Yabbadabbadoo                        |        #
@@ -113,7 +114,6 @@ AlphaBetaGamma        B        X Yabbadabbadoo
 #           7.00#      .0|      .0|      .0|      .0|      .0|      .0|      .0|      .0#
 #Total          #     .0%|     .0%|     .0%|     .0%|    1.0%|     .0%|     .0%|    1.0%#
 #===============#========#========#========#========#========#========#========#========#
-
 EOF
 if [ $? -ne 0 ] ; then fail ; fi