Checkin of new directory structure.

[pspp-builds.git] / tests / command / file-handle.sh

diff --git a/tests/command/file-handle.sh b/tests/command/file-handle.sh
index fecb7b33d3cd65a0e6986f97712f476509274195..fcf1907f1c0ed5d8fe1b1846b9974ced832070a3 100755 (executable)
--- a/tests/command/file-handle.sh
+++ b/tests/command/file-handle.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
@@ -68,13 +71,13 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $top_builddir/src/pspp --testing-mode -o raw-ascii $TESTFILE
 if [ $? -ne 0 ] ; then no_result ; fi
 
 
 activity="compare output"
 diff  -b  $TEMPDIR/pspp.list - << EOF 
-1.1 DATA LIST.  Reading free-form data from file $TEMPDIR/wiggle.txt.
+1.1 DATA LIST.  Reading free-form data from myhandle.
 +--------+------+
 |Variable|Format|
 #========#======#