projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added scale update to innovations algorithm
[pspp-builds.git]
/
tests
/
command
/
print.sh
diff --git
a/tests/command/print.sh
b/tests/command/print.sh
index a1be60c92fb92cc939d7dba1a88df8bd5b7ff68e..a7e5b655210f45faeaab715e6450a1c1e25f1de4 100755
(executable)
--- a/
tests/command/print.sh
+++ b/
tests/command/print.sh
@@
-5,16
+5,24
@@
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()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-71,7
+79,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii --testing-mode $TEMPDIR/print.stat > $TEMPDIR/errs
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii --testing-mode $TEMPDIR/print.stat > $TEMPDIR/errs
# Note vv --- there are errors in input. Therefore, the command must FAIL
if [ $? -eq 0 ] ; then fail ; fi
# Note vv --- there are errors in input. Therefore, the command must FAIL
if [ $? -eq 0 ] ; then fail ; fi
@@
-96,8
+104,9
@@
if [ $? -ne 0 ] ; then fail ; fi
activity="compare output"
activity="compare output"
-diff -b -B $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST. Reading free-form data from file $TEMPDIR/data-list.data.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
+diff -b $TEMPDIR/pspp.list - << EOF
+1.1 DATA LIST. Reading free-form data from "$TEMPDIR/data-list.data".
+--------+------+
|Variable|Format|
#========#======#
+--------+------+
|Variable|Format|
#========#======#
@@
-106,8
+115,7
@@
diff -b -B $TEMPDIR/pspp.list - << EOF
|C |F8.0 |
|D |F8.0 |
+--------+------+
|C |F8.0 |
|D |F8.0 |
+--------+------+
-
-2.1 PRINT. Writing 1 record(s) to file foo.
+2.1 PRINT. Writing 1 record to "foo".
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
@@
-118,17
+126,12
@@
diff -b -B $TEMPDIR/pspp.list - << EOF
|C | 1| 19- 28|N10.0 |
|"/" | 1| 29- 29|A1 |
+--------+------+-------+------+
|C | 1| 19- 28|N10.0 |
|"/" | 1| 29- 29|A1 |
+--------+------+-------+------+
-
-
A B C D
-------- -------- -------- --------
. 2.00 3.00 4.00
A B C D
-------- -------- -------- --------
. 2.00 3.00 4.00
-
. 6.00 7.00 8.00
. 6.00 7.00 8.00
-
. 10.00 11.00 12.00
. 10.00 11.00 12.00
-
-3.1 DATA LIST. Reading free-form data from file $TEMPDIR/data-list.data.
+3.1 DATA LIST. Reading free-form data from "$TEMPDIR/data-list.data".
+--------+------+
|Variable|Format|
#========#======#
+--------+------+
|Variable|Format|
#========#======#
@@
-137,8
+140,7
@@
diff -b -B $TEMPDIR/pspp.list - << EOF
|C |F8.0 |
|D |F8.0 |
+--------+------+
|C |F8.0 |
|D |F8.0 |
+--------+------+
-
-4.1 PRINT. Writing 1 record(s) to the listing file.
+4.1 PRINT. Writing 1 record.
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
@@
-148,7
+150,6
@@
diff -b -B $TEMPDIR/pspp.list - << EOF
|D | 1| 28- 35|F8.2 |
+--------+------+-------+------+
. 2.00 3.00 4.00
|D | 1| 28- 35|F8.2 |
+--------+------+-------+------+
. 2.00 3.00 4.00
-
A B C D
-------- -------- -------- --------
. 2.00 3.00 4.00
A B C D
-------- -------- -------- --------
. 2.00 3.00 4.00
@@
-162,7
+163,6
@@
diff -b -B $TEMPDIR/pspp.list - << EOF
10.00 11.00 . .
12.00 . . .
12.00 . . .
10.00 11.00 . .
12.00 . . .
12.00 . . .
-
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi