projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid use of $* in Makefile since it's problematic
[pspp-builds.git]
/
tests
/
bugs
/
agg-crash-2.sh
diff --git
a/tests/bugs/agg-crash-2.sh
b/tests/bugs/agg-crash-2.sh
index 384c3c80bc58e99fcc83afdf5ed4bfc9862a307a..0b006780f319de5ac506e877543c2e25be7d94da 100755
(executable)
--- a/
tests/bugs/agg-crash-2.sh
+++ b/
tests/bugs/agg-crash-2.sh
@@
-6,16
+6,26
@@
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
TEMPDIR=/tmp/pspp-tst-$$
TESTFILE=$TEMPDIR/`basename $0`.sps
-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
# ensure that top_srcdir is absolute
# ensure that top_srcdir is absolute
-
cd $top_srcdir; top_srcdir=`
pwd`
+
top_srcdir=`cd $top_srcdir;
pwd`
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-49,7
+59,7
@@
cd $TEMPDIR
activity="create program"
cat > $TESTFILE <<EOF
activity="create program"
cat > $TESTFILE <<EOF
-DATA LIST LIST /
x (F8.2) y
(a25).
+DATA LIST LIST /
X (F8.2) Y
(a25).
BEGIN DATA.
87.50 foo
BEGIN DATA.
87.50 foo
@@
-59,27
+69,27
@@
END DATA.
-AGGREGATE
/BREAK=y /x
=MAX(x).
+AGGREGATE
OUTFILE=* /BREAK=y /X
=MAX(x).
LIST /x y.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
LIST /x y.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
if [ $? -ne 0 ] ; then no_result ; fi
-diff -b -B -w $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST. Reading free-form data from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b -w $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST. Reading free-form data from INLINE.
+--------+------+
|Variable|Format|
#========#======#
|X |F8.2 |
|Y |A25 |
+--------+------+
+--------+------+
|Variable|Format|
#========#======#
|X |F8.2 |
|Y |A25 |
+--------+------+
-
- X Y
--------- -------------------------
- 87.34 bar
- 87.50 foo
+ X Y
+--------- -------------------------
+ 87.34 bar
+ 87.50 foo
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi