Checkin of new directory structure.

[pspp-builds.git] / tests / bugs / val-labs.sh

diff --git a/tests/bugs/val-labs.sh b/tests/bugs/val-labs.sh
index 719a67350cba0723c045e7cf24b4f26568a07313..0858c9c1bbf11c46549158fe9cba3a1150d540e5 100755 (executable)
--- a/tests/bugs/val-labs.sh
+++ b/tests/bugs/val-labs.sh
@@ -7,10 +7,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
@@ -69,7 +72,7 @@ if [ $? -ne 0 ] ; then no_result ; fi
 
 #Invalid syntax --- return value is non zero.
 activity="run program"
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $top_builddir/src/pspp -o raw-ascii $TESTFILE > /dev/null
 if [ $? -ne 1 ] ; then fail ; fi
 
 pass;