projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed mistakes
[pspp-builds.git]
/
tests
/
stats
/
descript-basic.sh
diff --git
a/tests/stats/descript-basic.sh
b/tests/stats/descript-basic.sh
index 094c6cf170f6eb7f4aba46e83a2d80bf12328e90..8f772ed3795a37ae34815e8e6febf15157b6e35a 100755
(executable)
--- a/
tests/stats/descript-basic.sh
+++ b/
tests/stats/descript-basic.sh
@@
-4,14
+4,20
@@
TEMPDIR=/tmp/pspp-tst-$$
TEMPDIR=/tmp/pspp-tst-$$
-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()
{
@@
-72,13
+78,13
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp
-o raw-ascii $TEMPDIR/descript.stat
+$SUPERVISOR $
PSPP
-o raw-ascii $TEMPDIR/descript.stat
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
perl -pi -e 's/^\s*$//g' $TEMPDIR/pspp.list
-diff
-b $TEMPDIR/pspp.list - <<EOF
-1.1 DATA LIST. Reading 1 record from
the command file
.
+diff -b $TEMPDIR/pspp.list - <<EOF
+1.1 DATA LIST. Reading 1 record from
INLINE
.
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#
+--------+------+-------+------+
|Variable|Record|Columns|Format|
#========#======#=======#======#