X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fxforms%2Fcasefile.sh;h=c354857240b1b1bf7094304bcff2c370b99e5d0f;hb=799e56c0e3a9911a860607e1c07caf2acf8cc9ef;hp=015ce8c6f2c536c17f1b5a900b39ce9163f2cd17;hpb=829c9392ee103e34cd81e7c9aee5cdf24d6029dc;p=pspp-builds.git

diff --git a/tests/xforms/casefile.sh b/tests/xforms/casefile.sh
index 015ce8c6..c3548572 100755
--- a/tests/xforms/casefile.sh
+++ b/tests/xforms/casefile.sh
@@ -4,16 +4,22 @@
 
 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`
 
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
 
 
 cleanup()
 {
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -52,19 +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"
-diff -b -B $TEMPDIR/casefile.out - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/casefile.out
+diff -b $TEMPDIR/casefile.out - <<EOF
 Casefile tests succeeded.
 EOF
-
-if [ $? -ne 0 ] ; then no_result ; fi
-
-
 if [ $? -ne 0 ] ; then fail ; fi
 
 
-
 pass;