projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pspp: Fix crash passing the name of a nonexistent file on the command line.
[pspp]
/
tests
/
stats
/
moments.sh
diff --git
a/tests/stats/moments.sh
b/tests/stats/moments.sh
index 0c6806ab027c19f463344f95d37be9e78185c169..a0a72c6365022facedf0fb52d7ff363a37d9743b 100755
(executable)
--- a/
tests/stats/moments.sh
+++ b/
tests/stats/moments.sh
@@
-4,10
+4,14
@@
TEMPDIR=/tmp/pspp-tst-$$
TEMPDIR=/tmp/pspp-tst-$$
-here=`pwd`;
+# ensure that top_builddir are absolute
+if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
+if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
+top_builddir=`cd $top_builddir; pwd`
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
# ensure that top_srcdir is absolute
# ensure that top_srcdir is absolute
-
cd $top_srcdir; top_srcdir=`
pwd`
+
top_srcdir=`cd $top_srcdir;
pwd`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-15,9
+19,12
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
cd /
rm -rf $TEMPDIR
- :
}
}
@@
-77,11
+84,12
@@
sed < $TEMPDIR/moments-list-2p >> $TEMPDIR/moments-2p.stat \
if [ $? -ne 0 ] ; then no_result ; fi
activity="run two-pass program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run two-pass program"
-$SUPERVISOR $
here/../src/pspp --testing-mode -o raw-ascii
\
+$SUPERVISOR $
PSPP --testing-mode -o pspp.csv
\
$TEMPDIR/moments-2p.stat >$TEMPDIR/moments-2p.err 2> $TEMPDIR/moments-2p.out
activity="compare two-pass output"
$TEMPDIR/moments-2p.stat >$TEMPDIR/moments-2p.err 2> $TEMPDIR/moments-2p.out
activity="compare two-pass output"
-diff -B -b $TEMPDIR/moments-list-2p $TEMPDIR/moments-2p.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/moments-list-2p $TEMPDIR/moments-2p.out
+diff -b $TEMPDIR/moments-list-2p $TEMPDIR/moments-2p.out
if [ $? -ne 0 ] ; then fail ; fi
activity="create input file"
if [ $? -ne 0 ] ; then fail ; fi
activity="create input file"
@@
-90,11
+98,12
@@
sed < $TEMPDIR/moments-list-1p >> $TEMPDIR/moments-1p.stat \
if [ $? -ne 0 ] ; then no_result ; fi
activity="run one-pass program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run one-pass program"
-$SUPERVISOR $
here/../src/pspp --testing-mode -o raw-ascii
\
+$SUPERVISOR $
PSPP --testing-mode -o pspp.csv
\
$TEMPDIR/moments-1p.stat >$TEMPDIR/moments-1p.err 2> $TEMPDIR/moments-1p.out
activity="compare one-pass output"
$TEMPDIR/moments-1p.stat >$TEMPDIR/moments-1p.err 2> $TEMPDIR/moments-1p.out
activity="compare one-pass output"
-diff -B -b $TEMPDIR/moments-list-1p $TEMPDIR/moments-1p.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/moments-list-1p $TEMPDIR/moments-1p.out
+diff -b $TEMPDIR/moments-list-1p $TEMPDIR/moments-1p.out
if [ $? -ne 0 ] ; then fail ; fi
pass
if [ $? -ne 0 ] ; then fail ; fi
pass