projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/stable'
[pspp-builds.git]
/
tests
/
command
/
data-list.sh
diff --git
a/tests/command/data-list.sh
b/tests/command/data-list.sh
index 9f073013267f8204d1ece80ca8d6aa46a3202fdf..3f821199ff3e2d10f22627e6ce35c93ec7b1f157 100755
(executable)
--- a/
tests/command/data-list.sh
+++ b/
tests/command/data-list.sh
@@
-9,6
+9,7
@@
TESTFILE=$TEMPDIR/`basename $0`.sps
if [ -z "$top_builddir" ] ; then top_builddir=. ; fi
if [ -z "$top_srcdir" ] ; then top_srcdir=. ; fi
top_builddir=`cd $top_builddir; pwd`
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
top_srcdir=`cd $top_srcdir; pwd`
# ensure that top_srcdir is absolute
top_srcdir=`cd $top_srcdir; pwd`
@@
-19,6
+20,10
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
cd /
rm -rf $TEMPDIR
}
@@
-63,14
+68,15
@@
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
7,
8 9
,1,2,3
,4,,5
6
7,
8 9
-0,1,,,
+0,1
,,,
,,,,
2
,,,,
2
@@
-80,8
+86,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
@@
-98,6
+106,40
@@
begin data.
3
4
3
4
+end data.
+list.
+
+* Test DATA LIST FIXED with multiple records.
+data list fixed notable
+ /1 start 1-20 (adate)
+ /2 end 1-20 (adate)
+ /3 count 1-3.
+begin data.
+07-22-2007
+10-06-2007
+321
+07-14-1789
+08-26-1789
+4
+01-01-1972
+12-31-1999
+682
+end data.
+list.
+
+* Test that DATA LIST FIXED works with an empty trailing record.
+data list fixed notable records=2/x 1 y 2.
+begin data.
+12
+
+34
+
+56
+
+78
+
+90
+
end data.
list.
EOF
end data.
list.
EOF
@@
-105,7
+147,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
top_builddir/src/pspp --testing-mode -o raw-ascii
--testing-mode $TESTFILE
+$SUPERVISOR $
PSPP
--testing-mode $TESTFILE
if [ $? -ne 0 ] ; then fail ; fi
activity="compare output"
if [ $? -ne 0 ] ; then fail ; fi
activity="compare output"
@@
-151,6
+193,18
@@
diff -b $TEMPDIR/pspp.list - << EOF
. . 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
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi