X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fexpressions%2Frandist.sh;h=d7404977c1dae11eb5a6461e3afa6d033953032c;hb=1beb9fbbe465dc30bc8f913b3dc90680494d38d9;hp=b1c9f440317e53b8a4a824f325cb28782bc7f839;hpb=65a4e29574b67921ea899b6a1d45806dca11db00;p=pspp

diff --git a/tests/expressions/randist.sh b/tests/expressions/randist.sh
index b1c9f44031..d7404977c1 100755
--- a/tests/expressions/randist.sh
+++ b/tests/expressions/randist.sh
@@ -9,7 +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
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
 
 
 STAT_CONFIG_PATH=$top_srcdir/config
@@ -19,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 /
@@ -60,15 +60,15 @@ perl $top_srcdir/tests/expressions/randist/randist.pl \
 if [ $? -ne 0 ] ; then no_result ; fi
 
 activity="run command file"
-$SUPERVISOR $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