projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged changes from branch interaction-review
[pspp-builds.git]
/
tests
/
command
/
beg-data.sh
diff --git
a/tests/command/beg-data.sh
b/tests/command/beg-data.sh
index 4c6ee92d3edf4c53e754d58ca4bbf0c79f1505f3..6d835015e7e3d6ade18ccbe7cf0b45caa957cc70 100755
(executable)
--- a/
tests/command/beg-data.sh
+++ b/
tests/command/beg-data.sh
@@
-5,17
+5,27
@@
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
+LANG=C
+export LANG
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
cd /
rm -rf $TEMPDIR
}
@@
-76,20
+86,19
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$SUPERVISOR $
PSPP --testing-mode
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare data"
perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare data"
perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff -b $TEMPDIR/pspp.list - << foobar
|perl -e 's/^\s*$//g'
-1.1 DATA LIST. Reading 1 record from
the command file
.
+diff -b $TEMPDIR/pspp.list - << foobar
+1.1 DATA LIST. Reading 1 record from
INLINE
.
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
|A | 1| 1- 1|F1.0 |
|B | 1| 2- 2|F1.0 |
+--------+------+-------+------+
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
|A | 1| 1- 1|F1.0 |
|B | 1| 2- 2|F1.0 |
+--------+------+-------+------+
-
A B
- -
1 2
A B
- -
1 2
@@
-97,15
+106,13
@@
A B
5 6
7 8
9 0
5 6
7 8
9 0
-
-2.1 DATA LIST. Reading 1 record from the command file.
+2.1 DATA LIST. Reading 1 record from INLINE.
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
|A | 1| 1- 1|F1.0 |
|B | 1| 2- 2|F1.0 |
+--------+------+-------+------+
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
|A | 1| 1- 1|F1.0 |
|B | 1| 2- 2|F1.0 |
+--------+------+-------+------+
-
A B
- -
0 9
A B
- -
0 9