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
cleanup()
{
if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
- echo NOT removing directory $TEMPDIR
+ echo "NOT cleaning $TEMPDIR"
return ;
fi
cd /
if [ $? -ne 0 ] ; then no_result ; fi
activity="run command file"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii \
+$SUPERVISOR $PSPP --testing-mode \
$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