projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed intialization of coefficients
[pspp]
/
tests
/
command
/
loop.sh
diff --git
a/tests/command/loop.sh
b/tests/command/loop.sh
index f5bfc92a5707d7d10273b7a9b627908e54ab48db..7c7e493aa3767ece748ac3e16bd1c978c4cb1583 100755
(executable)
--- a/
tests/command/loop.sh
+++ b/
tests/command/loop.sh
@@
-5,14
+5,21
@@
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
+LANG=C
+export LANG
+
cleanup()
{
cleanup()
{
@@
-66,19
+73,19
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii $TEMPDIR/loop.stat > $TEMPDIR/stdout
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii $TEMPDIR/loop.stat > $TEMPDIR/stdout
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare stdout"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare stdout"
-diff -B -b $TEMPDIR/stdout - <<EOF
-$TEMPDIR/loop.stat:10: warning: BREAK: BREAK not enclosed in DO IF structure.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/stdout
+diff -b $TEMPDIR/stdout - <<EOF
EOF
if [ $? -ne 0 ] ; then fail ; fi
activity="compare results"
EOF
if [ $? -ne 0 ] ; then fail ; fi
activity="compare results"
-perl -pi -e
s/^\s*\$//g
$TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - <<EOF
| perl -e 's/^\s*$//g'
-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 - <<EOF
+1.1 DATA LIST. Reading 1 record from
INLINE
.
+----------+------+-------+------+
| Variable |Record|Columns|Format|
#==========#======#=======#======#
+----------+------+-------+------+
| Variable |Record|Columns|Format|
#==========#======#=======#======#