TESTFILE=$TEMPDIR/aggregate.pspp
-here=`pwd`;
-
-# ensure that top_srcdir is absolute
-cd $top_srcdir; top_srcdir=`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
STAT_CONFIG_PATH=$top_srcdir/config
cleanup()
{
+ cd /
rm -rf $TEMPDIR
}
4 1.00 1.00 1 1 . . . 1.000 . . . .000 . . . .000 . . 4 . . . 1.000 . . 4 . . 4 . . . . 4 .00 .00 .00 1.00 1.00 1.00 1.00 .00 0 0 0 1 1 1 1 0 . . . 100.0 . . . .0 . . . .0 . . . 100.0 . . . .
EOF
-for outfile in active external; do
+for outfile in scratch active external; do
for sort in presorted unsorted; do
for missing in itemwise columnwise; do
name=$outfile-$sort-$missing
echo "aggregate"
if [ "$outfile" = "active" ]; then
echo " outfile=*"
- else
+ elif [ "$outfile" = "external" ]; then
echo " outfile='aggregate.sys'"
+ else
+ echo " outfile=#AGGREGATE"
fi
if [ "$sort" = "presorted" ]; then
echo " /presorted"
cat agg-skel.pspp
if [ "$outfile" = "external" ]; then
echo "get file='aggregate.sys'."
+ elif [ "$outfile" = "scratch" ]; then
+ echo "get file=#AGGREGATE."
fi
echo "list."
} > $name.pspp
if [ $? -ne 0 ] ; then no_result ; fi
activity="run $name.pspp"
- $SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $name.pspp >/dev/null 2>&1
+ $SUPERVISOR $PSPP --testing-mode -o raw-ascii -e /dev/null $name.pspp
if [ $? -ne 0 ] ; then no_result ; fi
activity="check $name output"
- diff -b -w -B pspp.list agg-$missing.out
+ perl -pi -e 's/^\s*$//g' pspp.list agg-$missing.out
+ diff -b -w pspp.list agg-$missing.out
if [ $? -ne 0 ] ; then fail ; fi
done
done