X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fexpressions%2Frandist.sh;h=88a57e5fcba4d643b2a6614a1ac0308886d9dee2;hb=f51ecb48027e6b1eb46840ae25888a25b429f012;hp=7602aede03e801be7f991552bcadf36de90d1473;hpb=009350385d97d9fba2b33ea68cfe8b1aeebf1529;p=pspp

diff --git a/tests/expressions/randist.sh b/tests/expressions/randist.sh
index 7602aede03..88a57e5fcb 100755
--- a/tests/expressions/randist.sh
+++ b/tests/expressions/randist.sh
@@ -9,6 +9,7 @@ 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
 
 
 STAT_CONFIG_PATH=$top_srcdir/config
@@ -18,7 +19,7 @@ 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 /
@@ -59,15 +60,15 @@ perl $top_srcdir/tests/expressions/randist/randist.pl \
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run command file"
-$SUPERVISOR $top_builddir/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"
-    perl -pi -e 's/^\s*$//g' $top_srcdir/tests/expressions/randist/$d.out $TEMPDIR/$d.out
-    diff -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