Checkin of new directory structure.

[pspp-builds.git] / tests / bugs / crosstabs.sh

diff --git a/tests/bugs/crosstabs.sh b/tests/bugs/crosstabs.sh
index 0125d7e7b14d1c9a6fd535291f1aa4d8fc36e073..41e2cf01a9bec7462e06381d409659fca965e59b 100755 (executable)
--- a/tests/bugs/crosstabs.sh
+++ b/tests/bugs/crosstabs.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,7 +79,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$SUPERVISOR $here/../src/pspp $TEMPDIR/ct.stat
+$SUPERVISOR $top_builddir/src/pspp $TEMPDIR/ct.stat
 if [ $? -ne 0 ] ; then fail ; fi