projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid use of $* in Makefile since it's problematic
[pspp-builds.git]
/
tests
/
command
/
lag.sh
diff --git
a/tests/command/lag.sh
b/tests/command/lag.sh
index c1adf609072dcf56365b09fdb91abcbe93a28b29..bc14e1a93dfc2a6b1b5ef1c7b733b5e31b82956b 100755
(executable)
--- a/
tests/command/lag.sh
+++ b/
tests/command/lag.sh
@@
-5,16
+5,28
@@
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`
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
+LANG=C
+export LANG
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-48,7
+60,7
@@
cd $TEMPDIR
activity="create program"
cat > $TEMPDIR/lag.stat <<EOF
activity="create program"
cat > $TEMPDIR/lag.stat <<EOF
-data list /
w
1.
+data list /
W
1.
begin data.
1
2
begin data.
1
2
@@
-57,26
+69,26
@@
begin data.
5
end data.
5
end data.
-compute
x
=lag(w,1).
-compute
y
=lag(x).
-compute
z
=lag(w,2).
+compute
X
=lag(w,1).
+compute
Y
=lag(x).
+compute
Z
=lag(w,2).
list.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
list.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TEMPDIR/lag.stat
+$SUPERVISOR $
PSPP --testing-mode
$TEMPDIR/lag.stat
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare result"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare result"
-diff -b -B $TEMPDIR/pspp.list - <<EOF
-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|
#========#======#=======#======#
|W | 1| 1- 1|F1.0 |
+--------+------+-------+------+
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
|W | 1| 1- 1|F1.0 |
+--------+------+-------+------+
-
W X Y Z
- -------- -------- --------
1 . . .
W X Y Z
- -------- -------- --------
1 . . .