projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add tty and listing devices that use VT100 (and xterm) line-drawing
[pspp]
/
tests
/
command
/
no_case_size.sh
diff --git
a/tests/command/no_case_size.sh
b/tests/command/no_case_size.sh
index 9e4ac2400ca5cdf280cfbbfa8fe2521dd62cfb99..738ea1404791fe22963f40f2e3fa92b6fb12d4af 100755
(executable)
--- a/
tests/command/no_case_size.sh
+++ b/
tests/command/no_case_size.sh
@@
-7,10
+7,14
@@
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`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-64,38
+68,37
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-diff -b -B -w pspp.list - <<EOF
+perl -pi -e 's/^\s*$//g' pspp.list
+diff -b -w pspp.list - <<EOF
1.1 DISPLAY.
+--------+-------------------------------------------+--------+
|Variable|Description |Position|
#========#===========================================#========#
1.1 DISPLAY.
+--------+-------------------------------------------+--------+
|Variable|Description |Position|
#========#===========================================#========#
-|
CONT
|continents of the world | 1|
+|
cont
|continents of the world | 1|
| |Format: A32 | |
+--------+-------------------------------------------+--------+
| |Format: A32 | |
+--------+-------------------------------------------+--------+
-|
SIZE
|sq km | 2|
+|
size
|sq km | 2|
| |Format: F8.2 | |
+--------+-------------------------------------------+--------+
| |Format: F8.2 | |
+--------+-------------------------------------------+--------+
-|
POP
|population | 3|
+|
pop
|population | 3|
| |Format: F8.2 | |
+--------+-------------------------------------------+--------+
| |Format: F8.2 | |
+--------+-------------------------------------------+--------+
-|
COUNT
|number of countries | 4|
+|
count
|number of countries | 4|
| |Format: F8.2 | |
+--------+-------------------------------------------+--------+
| |Format: F8.2 | |
+--------+-------------------------------------------+--------+
-
- CONT SIZE POP COUNT
+ cont size pop count
-------------------------------- -------- -------- --------
-------------------------------- -------- -------- --------
-Asia 44579000 3.
67E+
09 44.00
-Africa 30065000 7.
78E+
08 53.00
-North America 24256000 4.8
3E+
08 23.00
-South America 17819000 3.4
2E+
08 12.00
+Asia 44579000 3.
7E+0
09 44.00
+Africa 30065000 7.
8E+0
08 53.00
+North America 24256000 4.8
E+0
08 23.00
+South America 17819000 3.4
E+0
08 12.00
Antarctica 13209000 .00 .00
Antarctica 13209000 .00 .00
-Europe 9938000 7.3
2E+
08 46.00
+Europe 9938000 7.3
E+0
08 46.00
Australia/Oceania 7687000 31000000 14.00
Australia/Oceania 7687000 31000000 14.00
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi