X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fbugs%2Fcrosstabs.sh;h=b4eb3dbec8cf68fb615901575d1612eabd9d5e05;hb=d94b00b8d019bb2fda05366a2e86505fff13dbe3;hp=1635fe589dbabafa8456fbc4b65cf773faf4402e;hpb=b7852df2743416201dc85fd672644799cdd1b7b5;p=pspp-builds.git

diff --git a/tests/bugs/crosstabs.sh b/tests/bugs/crosstabs.sh
index 1635fe58..b4eb3dbe 100755
--- a/tests/bugs/crosstabs.sh
+++ b/tests/bugs/crosstabs.sh
@@ -5,16 +5,22 @@
 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`
+PSPP=$top_builddir/src/ui/terminal/pspp
 
 # 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()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -74,7 +80,7 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
-$SUPERVISOR $here/../src/pspp $TEMPDIR/ct.stat
+$SUPERVISOR $PSPP $TEMPDIR/ct.stat
 if [ $? -ne 0 ] ; then fail ; fi