projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed memory leak. Made coeff a linreg_coeff** for easier use.
[pspp-builds.git]
/
tests
/
command
/
print.sh
diff --git
a/tests/command/print.sh
b/tests/command/print.sh
index 78c6212fcfa5ae19f5b7d074e04191573667f391..32a96d7f27d480e2077d7914981c2d4a519de4e3 100755
(executable)
--- a/
tests/command/print.sh
+++ b/
tests/command/print.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
@@
-73,7
+77,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
@@
-100,7
+104,7
@@
if [ $? -ne 0 ] ; then fail ; fi
activity="compare output"
perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff -b $TEMPDIR/pspp.list - << EOF
activity="compare output"
perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
diff -b $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST. Reading free-form data from
file $TEMPDIR/data-list.data
.
+1.1 DATA LIST. Reading free-form data from
"$TEMPDIR/data-list.data"
.
+--------+------+
|Variable|Format|
#========#======#
+--------+------+
|Variable|Format|
#========#======#
@@
-109,7
+113,7
@@
diff -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|
#========#======#=======#======#
@@
-125,7
+129,7
@@
diff -b $TEMPDIR/pspp.list - << EOF
. 2.00 3.00 4.00
. 6.00 7.00 8.00
. 10.00 11.00 12.00
. 2.00 3.00 4.00
. 6.00 7.00 8.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|
#========#======#
@@
-134,7
+138,7
@@
diff -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|
#========#======#=======#======#