projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
tests
/
command
/
longvars.sh
diff --git
a/tests/command/longvars.sh
b/tests/command/longvars.sh
index d0fe2e81031f5e611b4de12b9c0ccfdbb593903e..3501f2183f04034748f9c6da83f6499952e815ba 100755
(executable)
--- a/
tests/command/longvars.sh
+++ b/
tests/command/longvars.sh
@@
-5,16
+5,28
@@
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()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-65,25
+77,24
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-diff -B -b $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST. Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|ALPHABET|F8.0 |
-|B |F8.0 |
-|X |F8.0 |
-|YABBADAB|F8.0 |
-+--------+------+
-
-ALPHABET B X YABBADAB
--------- -------- -------- --------
- 2.00 3.00 4.00 5.00
-
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - <<EOF
+1.1 DATA LIST. Reading free-form data from INLINE.
++--------------+------+
+| Variable |Format|
+#==============#======#
+|AlphaBetaGamma|F8.0 |
+|B |F8.0 |
+|X |F8.0 |
+|Yabbadabbadoo |F8.0 |
++--------------+------+
+AlphaBetaGamma B X Yabbadabbadoo
+-------------- -------- -------- -------------
+ 2.00 3.00 4.00 5.00
2.1 CROSSTABS. Summary.
#===============#=====================================================#
# # Cases #
2.1 CROSSTABS. Summary.
#===============#=====================================================#
# # Cases #
@@
-92,12
+103,12
@@
ALPHABET B X YABBADAB
# #--------+--------+--------+--------+--------+--------#
# # N| Percent| N| Percent| N| Percent#
#---------------#--------+--------+--------+--------+--------+--------#
# #--------+--------+--------+--------+--------+--------#
# # N| Percent| N| Percent| N| Percent#
#---------------#--------+--------+--------+--------+--------+--------#
-#X * YABBADAB # 1| 100.0%| 0| 0.0%| 1| 100.0%#
+#X * # 1| 100.0%| 0| 0.0%| 1| 100.0%#
+#Yabbadabbadoo # | | | | | #
#===============#========#========#========#========#========#========#
#===============#========#========#========#========#========#========#
-
-2.2 CROSSTABS. X by YABBADAB [count].
+2.2 CROSSTABS. X * Yabbadabbadoo [count].
#===============#==============================================================#========#
#===============#==============================================================#========#
-# #
YABBADAB
| #
+# #
Yabbadabbadoo
| #
# #--------+--------+--------+--------+--------+--------+--------+ #
# X# 1.00| 2.00| 3.00| 4.00| 5.00| 6.00| 7.00| Total #
#---------------#--------+--------+--------+--------+--------+--------+--------+--------#
# #--------+--------+--------+--------+--------+--------+--------+ #
# X# 1.00| 2.00| 3.00| 4.00| 5.00| 6.00| 7.00| Total #
#---------------#--------+--------+--------+--------+--------+--------+--------+--------#
@@
-108,9
+119,8
@@
ALPHABET B X YABBADAB
# 5.00# .0| .0| .0| .0| .0| .0| .0| .0#
# 6.00# .0| .0| .0| .0| .0| .0| .0| .0#
# 7.00# .0| .0| .0| .0| .0| .0| .0| .0#
# 5.00# .0| .0| .0| .0| .0| .0| .0| .0#
# 6.00# .0| .0| .0| .0| .0| .0| .0| .0#
# 7.00# .0| .0| .0| .0| .0| .0| .0| .0#
-#Total #
.0%| .0%| .0%| .0%| 1.0%| .0%| .0%| 1.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