Checkin of new directory structure.

[pspp-builds.git] / tests / command / oneway-with-splits.sh

diff --git a/tests/command/oneway-with-splits.sh b/tests/command/oneway-with-splits.sh
index 3075467cbd114faf98ba6cb68114b6c40bee42a9..eadc55b1c87a3659557d69483a8745cca8ec44a0 100755 (executable)
--- a/tests/command/oneway-with-splits.sh
+++ b/tests/command/oneway-with-splits.sh
@@ -6,12 +6,16 @@
 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()
@@ -20,6 +24,7 @@ cleanup()
        echo Not cleaning $TEMPDIR;
        return ; 
     fi
+    cd /
     rm -rf $TEMPDIR
 }
 
@@ -90,11 +95,12 @@ 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
 
-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 | perl -e 's/^\s*$//g'
+1.1 DATA LIST.  Reading free-form data from INLINE.
 +--------+------+
 |Variable|Format|
 #========#======#