projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix comment.
[pspp-builds.git]
/
tests
/
bugs
/
crosstabs-crash.sh
diff --git
a/tests/bugs/crosstabs-crash.sh
b/tests/bugs/crosstabs-crash.sh
index db301560f90015ac6b6297dc25aa5785fddf4101..0531094a13768d1226cd5b6fef3e4e0664b37e41 100755
(executable)
--- a/
tests/bugs/crosstabs-crash.sh
+++ b/
tests/bugs/crosstabs-crash.sh
@@
-6,16
+6,24
@@
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
+LANG=C
+export LANG
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-58,12
+66,13
@@
CROSSTABS VARIABLES X (1,7) Y (1,7) /TABLES X BY Y.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
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|
#========#======#
+--------+------+
|Variable|Format|
#========#======#
@@
-72,7
+81,6
@@
diff -b -B -w $TEMPDIR/pspp.list - << EOF
|X |F8.0 |
|Y |F8.0 |
+--------+------+
|X |F8.0 |
|Y |F8.0 |
+--------+------+
-
2.1 CROSSTABS. Summary.
#===============#=====================================================#
# # Cases #
2.1 CROSSTABS. Summary.
#===============#=====================================================#
# # Cases #
@@
-83,7
+91,6
@@
diff -b -B -w $TEMPDIR/pspp.list - << EOF
#---------------#--------+--------+--------+--------+--------+--------#
#X * Y # 1| 100.0%| 0| 0.0%| 1| 100.0%#
#===============#========#========#========#========#========#========#
#---------------#--------+--------+--------+--------+--------+--------#
#X * Y # 1| 100.0%| 0| 0.0%| 1| 100.0%#
#===============#========#========#========#========#========#========#
-
2.2 CROSSTABS. X by Y [count].
#===============#==============================================================#========#
# # Y | #
2.2 CROSSTABS. X by Y [count].
#===============#==============================================================#========#
# # Y | #
@@
-99,7
+106,6
@@
diff -b -B -w $TEMPDIR/pspp.list - << EOF
# 7.00# .0| .0| .0| .0| .0| .0| .0| .0#
#Total # .0%| .0%| .0%| .0%| 1.0%| .0%| .0%| 1.0%#
#===============#========#========#========#========#========#========#========#========#
# 7.00# .0| .0| .0| .0| .0| .0| .0| .0#
#Total # .0%| .0%| .0%| .0%| 1.0%| .0%| .0%| 1.0%#
#===============#========#========#========#========#========#========#========#========#
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi