Greatly simplify PSPP configuration.

[pspp-builds.git] / tests / expressions / randist.sh

diff --git a/tests/expressions/randist.sh b/tests/expressions/randist.sh
index 9c1ed925c688e013c1ccd2e22aa1a385f8eb7c88..88a57e5fcba4d643b2a6614a1ac0308886d9dee2 100755 (executable)
--- a/tests/expressions/randist.sh
+++ b/tests/expressions/randist.sh
@@ -4,10 +4,13 @@
 
 TEMPDIR=/tmp/pspp-tst-$$
 
-here=`pwd`;
+# ensure that top_srcdir and top_builddir  are absolute
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+top_srcdir=`cd $top_srcdir; pwd`
+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`
 
 STAT_CONFIG_PATH=$top_srcdir/config
 export STAT_CONFIG_PATH
@@ -16,9 +19,10 @@ export STAT_CONFIG_PATH
 cleanup()
 {
      if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then 
-        echo NOT removing directory $TEMPDIR
+       echo "NOT cleaning $TEMPDIR" 
        return ; 
      fi
+     cd /
      rm -rf $TEMPDIR
 }
 
@@ -56,14 +60,15 @@ perl $top_srcdir/tests/expressions/randist/randist.pl \
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run command file"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii \
+$SUPERVISOR $PSPP -o pspp.csv \
     $TEMPDIR/randist.pspp >$TEMPDIR/randist.err 2> $TEMPDIR/randist.out
 if [ $? -ne 0 ] ; then fail ; fi
 
 for d in beta cauchy chisq exp f gamma laplace logistic lnormal \
         normal pareto t uniform weibull; do
     activity="compare output for $d distribution"
-    diff -B -b $top_srcdir/tests/expressions/randist/$d.out $TEMPDIR/$d.out
+    perl $top_srcdir/tests/expressions/randist/compare.pl \
+       $top_srcdir/tests/expressions/randist/$d.out $TEMPDIR/$d.out
     if [ $? -ne 0 ] ; then fail ; fi
 done