projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add README explaining not to use msg() here.
[pspp-builds.git]
/
tests
/
command
/
file-label.sh
diff --git
a/tests/command/file-label.sh
b/tests/command/file-label.sh
index 99a3f6fd2dd56866e2454f5492732035f135095c..ca9da9cdc8064ea37d18a9ecffe98352e20febab 100755
(executable)
--- a/
tests/command/file-label.sh
+++ b/
tests/command/file-label.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
}
@@
-105,7
+110,7
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii $TESTFILE
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
# We need to filter out the dates/times
if [ $? -ne 0 ] ; then no_result ; fi
# We need to filter out the dates/times
@@
-115,49
+120,37
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
activity="compare results"
-diff -b -B $TEMPDIR/pspp.filtered - <<EOF
-1.1 DATA LIST. Reading 1 record from the command file.
+perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.filtered
+diff -b $TEMPDIR/pspp.filtered - <<EOF
+1.1 DATA LIST. Reading 1 record from INLINE.
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
|X | 1| 1- 1|F1.0 |
|Y | 1| 2- 2|F1.0 |
+--------+------+-------+------+
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
|X | 1| 1- 1|F1.0 |
|Y | 1| 2- 2|F1.0 |
+--------+------+-------+------+
-
Documents in the active file:
Documents in the active file:
-
First line of a document
This is the second very long line of a document in an attempt to overflow the
Note that the last line should end with a period: .
First line of a document
This is the second very long line of a document in an attempt to overflow the
Note that the last line should end with a period: .
-
File label:
This is a test file label
File label:
This is a test file label
-
Documents in the active file:
Documents in the active file:
-
First line of a document
This is the second very long line of a document in an attempt to overflow the
Note that the last line should end with a period: .
First line of a document
This is the second very long line of a document in an attempt to overflow the
Note that the last line should end with a period: .
-
File label:
This is a test file label
File label:
This is a test file label
-
Documents in the active file:
Documents in the active file:
-
First line of a document
This is the second very long line of a document in an attempt to overflow the
Note that the last line should end with a period: .
First line of a document
This is the second very long line of a document in an attempt to overflow the
Note that the last line should end with a period: .
-
There should be another document now.
There should be another document now.
-
Documents in the active file:
Documents in the active file:
-
First line of a document
This is the second very long line of a document in an attempt to overflow the
Note that the last line should end with a period: .
First line of a document
This is the second very long line of a document in an attempt to overflow the
Note that the last line should end with a period: .
-
There should be another document now.
There should be another document now.
-
File label:
This is a test file label
EOF
File label:
This is a test file label
EOF