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
+PSPP=$top_builddir/src/ui/terminal/pspp$EXEEXT
# ensure that top_srcdir is absolute
top_srcdir=`cd $top_srcdir; pwd`
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
activity="run program"
-$SUPERVISOR $PSPP --testing-mode $TESTFILE
+$SUPERVISOR $PSPP -o pspp.csv $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
activity="compare output"
-perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - << EOF
- A B C D
--------- -------- -------- --------
- 1.00 23.00 45.00 2.03
- 2.00 22.00 34.00 23.00
- 3.00 34.00 34.00 34.00
- A B C D
--------- -------- -------- --------
- . 1.00 2.00 3.00
- . 4.00 . 5.00
- 6.00 7.00 . 8.00
- 9.00 .00 1.00 .
- . . . .
- . . . 2.00
- . 3.00 4.00 5.00
- A B C D
--------- -------- -------- --------
- 1.00 2.00 3.00 4.00
- 1.00 2.00 3.00 .
- 1.00 2.00 . 4.00
- 1.00 2.00 . .
- 1.00 . 3.00 4.00
- 1.00 . 3.00 .
- 1.00 . . 4.00
- 1.00 . . .
- . 2.00 3.00 4.00
- . 2.00 3.00 .
- . 2.00 . 4.00
- . 2.00 . .
- . . 3.00 4.00
- . . 3.00 .
- . . . 4.00
- . . . .
- start end count
--------------------- -------------------- -----
- 07/22/2007 10/06/2007 321
- 07/14/1789 08/26/1789 4
- 01/01/1972 12/31/1999 682
-x y
-- -
-1 2
-3 4
-5 6
-7 8
-9 0
+diff -b $TEMPDIR/pspp.csv - << EOF
+Table: Data List
+A,B,C,D
+1.00,23.00,45.00,2.03
+2.00,22.00,34.00,23.00
+3.00,34.00,34.00,34.00
+
+Table: Data List
+A,B,C,D
+. ,1.00,2.00,3.00
+. ,4.00,. ,5.00
+6.00,7.00,. ,8.00
+9.00,.00,1.00,.
+. ,. ,. ,.
+. ,. ,. ,2.00
+. ,3.00,4.00,5.00
+
+Table: Data List
+A,B,C,D
+1.00,2.00,3.00,4.00
+1.00,2.00,3.00,.
+1.00,2.00,. ,4.00
+1.00,2.00,. ,.
+1.00,. ,3.00,4.00
+1.00,. ,3.00,.
+1.00,. ,. ,4.00
+1.00,. ,. ,.
+. ,2.00,3.00,4.00
+. ,2.00,3.00,.
+. ,2.00,. ,4.00
+. ,2.00,. ,.
+. ,. ,3.00,4.00
+. ,. ,3.00,.
+. ,. ,. ,4.00
+. ,. ,. ,.
+
+Table: Data List
+start,end,count
+07/22/2007,10/06/2007,321
+07/14/1789,08/26/1789,4
+01/01/1972,12/31/1999,682
+
+Table: Data List
+x,y
+1,2
+3,4
+5,6
+7,8
+9,0
EOF
if [ $? -ne 0 ] ; then fail ; fi