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
-cd $top_srcdir; top_srcdir=`pwd`
+top_srcdir=`cd $top_srcdir; pwd`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP --testing-mode $TESTFILE
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|
#========#===========================================#========#
-|CONT |continents of the world | 1|
+|cont |continents of the world | 1|
| |Format: A32 | |
+| |Measure: Nominal | |
+| |Display Alignment: Left | |
+| |Display Width: 8 | |
+--------+-------------------------------------------+--------+
-|SIZE |sq km | 2|
+|size |sq km | 2|
| |Format: F8.2 | |
+| |Measure: Nominal | |
+| |Display Alignment: Left | |
+| |Display Width: 8 | |
+--------+-------------------------------------------+--------+
-|POP |population | 3|
+|pop |population | 3|
| |Format: F8.2 | |
+| |Measure: Nominal | |
+| |Display Alignment: Left | |
+| |Display Width: 8 | |
+--------+-------------------------------------------+--------+
-|COUNT |number of countries | 4|
+|count |number of countries | 4|
| |Format: F8.2 | |
+| |Measure: Nominal | |
+| |Display Alignment: Left | |
+| |Display Width: 8 | |
+--------+-------------------------------------------+--------+
-
- 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.83E+08 23.00
-South America 17819000 3.42E+08 12.00
+Asia 44579000 3.7E+009 44.00
+Africa 30065000 7.8E+008 53.00
+North America 24256000 4.8E+008 23.00
+South America 17819000 3.4E+008 12.00
Antarctica 13209000 .00 .00
-Europe 9938000 7.32E+08 46.00
+Europe 9938000 7.3E+008 46.00
Australia/Oceania 7687000 31000000 14.00
-
EOF
if [ $? -ne 0 ] ; then fail ; fi