projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We've had a mix of min, max from libpspp/misc.h and MIN, MAX from
[pspp-builds.git]
/
tests
/
command
/
data-list.sh
diff --git
a/tests/command/data-list.sh
b/tests/command/data-list.sh
index bbcd589a546eeed1589b4c07ae00b8fa90494438..d16521a102168e9cfc4516b83042e6812dacf0ee 100755
(executable)
--- a/
tests/command/data-list.sh
+++ b/
tests/command/data-list.sh
@@
-5,10
+5,14
@@
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
@@
-16,6
+20,7
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-59,8
+64,9
@@
end data.
list.
list.
-data list free/A B C D.
+data list free
skip=1
/A B C D.
begin data.
begin data.
+# This record is ignored.
,1,2,3
,4,,5
6
,1,2,3
,4,,5
6
@@
-76,8
+82,10
@@
begin data.
end data.
list.
end data.
list.
-data list free (tab)/A B C D.
+data list free (tab)
skip=2
/A B C D.
begin data.
begin data.
+# These records
+# are skipped.
1 2 3 4
1 2 3
1 2 4
1 2 3 4
1 2 3
1 2 4
@@
-101,12
+109,13
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii --testing-mode $TESTFILE
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii --testing-mode $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
activity="compare output"
if [ $? -ne 0 ] ; then fail ; fi
activity="compare output"
-diff -b -B $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST. Reading free-form data from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST. Reading free-form data from INLINE.
+--------+------+
|Variable|Format|
#========#======#
+--------+------+
|Variable|Format|
#========#======#
@@
-115,13
+124,11
@@
diff -b -B $TEMPDIR/pspp.list - << EOF
|C |F8.0 |
|D |F8.0 |
+--------+------+
|C |F8.0 |
|D |F8.0 |
+--------+------+
-
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 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
A B C D
-------- -------- -------- --------
. 1.00 2.00 3.00
@@
-130,7
+137,6
@@
diff -b -B $TEMPDIR/pspp.list - << EOF
.00 1.00 . .
. . . .
2.00 3.00 4.00 5.00
.00 1.00 . .
. . . .
2.00 3.00 4.00 5.00
-
A B C D
-------- -------- -------- --------
1.00 2.00 3.00 4.00
A B C D
-------- -------- -------- --------
1.00 2.00 3.00 4.00