projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Greatly simplify PSPP configuration.
[pspp-builds.git]
/
tests
/
command
/
file-handle.sh
diff --git
a/tests/command/file-handle.sh
b/tests/command/file-handle.sh
index fecb7b33d3cd65a0e6986f97712f476509274195..937f05f79e625d5a063293c9380d746f6d3daade 100755
(executable)
--- a/
tests/command/file-handle.sh
+++ b/
tests/command/file-handle.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,10
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
cd /
rm -rf $TEMPDIR
}
cd /
rm -rf $TEMPDIR
}
@@
-68,26
+76,22
@@
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 -o pspp.csv
$TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare output"
-diff -b $TEMPDIR/pspp.list - << EOF
-1.1 DATA LIST. Reading free-form data from file $TEMPDIR/wiggle.txt.
-+--------+------+
-|Variable|Format|
-#========#======#
-|x |F8.0 |
-+--------+------+
-
- x
---------
- 1.00
- 2.00
- 5.00
- 109.00
-
+diff -c $TEMPDIR/pspp.csv - << EOF
+Table: Reading free-form data from myhandle.
+Variable,Format
+x,F8.0
+
+Table: Data List
+x
+1.00
+2.00
+5.00
+109.00
EOF
if [ $? -ne 0 ] ; then fail ; fi
EOF
if [ $? -ne 0 ] ; then fail ; fi