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$EXEEXT
# 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()
{
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
activity="run program"
-$SUPERVISOR $here/../src/pspp --testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="filter output"
-egrep -v '^(Created|Endian): ' $TEMPDIR/pspp.list > $TEMPDIR/out-filtered
+egrep -v '^(Created|Endian|Integer Format|Real Format):,' $TEMPDIR/pspp.csv > $TEMPDIR/out-filtered
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-diff -b -B -w $TEMPDIR/out-filtered - << EOF
-1.1 DATA LIST. Reading free-form data from the command file.
-+--------+------+
-|Variable|Format|
-#========#======#
-|x |F8.0 |
-|name |A10 |
-+--------+------+
-
-2.1 SYSFILE INFO.
-File: pro.sav
-Label: No label.
-Variables: 2
-Cases: 3
-Type: System File.
-Weight: Not weighted.
-Mode: Compression off.
-
-+--------+-------------+---+
-|Variable|Description |Pos|
-| | |iti|
-| | |on |
-#========#=============#===#
-|x |Format: F8.2 | 1|
-+--------+-------------+---+
-|name |Format: A10 | 2|
-+--------+-------------+---+
-
+diff -c $TEMPDIR/out-filtered - << EOF
+Table: Reading free-form data from INLINE.
+Variable,Format
+x,F8.0
+name,A10
+
+File:,pro.sav
+Label:,No label.
+Variables:,2
+Cases:,3
+Type:,System File
+Weight:,Not weighted.
+Mode:,Compression on.
+Charset:,Unknown
+
+Variable,Description,,Position
+x,Format: F8.2,,1
+,Measure: Scale,,
+,Display Alignment: Right,,
+,Display Width: 8,,
+name,Format: A10,,2
+,Measure: Nominal,,
+,Display Alignment: Left,,
+,Display Width: 10,,
EOF
if [ $? -ne 0 ] ; then fail ; fi