X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Fcommand%2Fbeg-data.sh;h=5b9e9384b30602c323a9055ef9ada5673a8e387e;hb=d5e3c75df80897a583aedcdbd4269a7ca5ccc491;hp=382e2a036594c327b3700e3892805927872c3395;hpb=c48bf64ab648b9b761a8e0774db3672d8009c64c;p=pspp-builds.git diff --git a/tests/command/beg-data.sh b/tests/command/beg-data.sh index 382e2a03..5b9e9384 100755 --- a/tests/command/beg-data.sh +++ b/tests/command/beg-data.sh @@ -3,17 +3,24 @@ # This program tests the BEGIN DATA / END DATA commands 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` -export STAT_CONFIG_PATH=$top_srcdir/config +STAT_CONFIG_PATH=$top_srcdir/config +export STAT_CONFIG_PATH cleanup() { + cd / rm -rf $TEMPDIR } @@ -46,15 +53,9 @@ mkdir -p $TEMPDIR cd $TEMPDIR activity="create program" -cat > $TEMPDIR/prog.sps << EOF_foobar +cat > $TESTFILE << EOF_foobar title 'Test BEGIN DATA ... END DATA'. -remark EOF ----------------------------------------------------------------------- -First we show that we can input data with BEGIN DATA/END DATA after -a procedure. ----------------------------------------------------------------------- -EOF data list /A B 1-2. list. begin data. @@ -65,11 +66,6 @@ begin data. 90 end data. -remark EOF ----------------------------------------------------------------------- -Next we show that BEGIN DATA/END DATA work fine on their own as well. ----------------------------------------------------------------------- -EOF data list /A B 1-2. begin data. 09 @@ -84,24 +80,19 @@ if [ $? -ne 0 ] ; then no_result ; fi activity="run program" -$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/prog.sps +$SUPERVISOR $PSPP -o raw-ascii $TESTFILE if [ $? -ne 0 ] ; then no_result ; fi activity="compare data" -diff -b -B $TEMPDIR/pspp.list - << foobar ----------------------------------------------------------------------- -First we show that we can input data with BEGIN DATA/END DATA after -a procedure. ----------------------------------------------------------------------- - -1.1 DATA LIST. Reading 1 record from the command file. +perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list +diff -b $TEMPDIR/pspp.list - << foobar +1.1 DATA LIST. Reading 1 record from INLINE. +--------+------+-------+------+ |Variable|Record|Columns|Format| #========#======#=======#======# |A | 1| 1- 1|F1.0 | |B | 1| 2- 2|F1.0 | +--------+------+-------+------+ - A B - - 1 2 @@ -109,19 +100,13 @@ A B 5 6 7 8 9 0 - ----------------------------------------------------------------------- -Next we show that BEGIN DATA/END DATA work fine on their own as well. ----------------------------------------------------------------------- - -2.1 DATA LIST. Reading 1 record from the command file. +2.1 DATA LIST. Reading 1 record from INLINE. +--------+------+-------+------+ |Variable|Record|Columns|Format| #========#======#=======#======# |A | 1| 1- 1|F1.0 | |B | 1| 2- 2|F1.0 | +--------+------+-------+------+ - A B - - 0 9