Add datasheet.

[pspp-builds.git] / tests / xforms / casefile.sh

diff --git a/tests/xforms/casefile.sh b/tests/xforms/casefile.sh
index f6aa54b20d8d8572843c6237e81118c7fa0988e3..c354857240b1b1bf7094304bcff2c370b99e5d0f 100755 (executable)
--- a/tests/xforms/casefile.sh
+++ b/tests/xforms/casefile.sh
@@ -4,10 +4,14 @@
 
 TEMPDIR=/tmp/pspp-tst-$$
 
-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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -54,20 +58,15 @@ EOF
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode $TEMPDIR/casefile.stat > $TEMPDIR/casefile.out
+$SUPERVISOR $PSPP --testing-mode $TEMPDIR/casefile.stat > $TEMPDIR/casefile.out
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="compare results"
 perl -pi -e 's/^\s*$//g' $TEMPDIR/casefile.out
-diff -b $TEMPDIR/casefile.out - <<EOF |perl -e 's/^\s*$//g'
+diff -b $TEMPDIR/casefile.out - <<EOF
 Casefile tests succeeded.
 EOF
-
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
 if [ $? -ne 0 ] ; then fail ; fi
 
 
-
 pass;