projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pspp: Fix crash passing the name of a nonexistent file on the command line.
[pspp]
/
tests
/
command
/
t-test-paired-missing-list.sh
diff --git
a/tests/command/t-test-paired-missing-list.sh
b/tests/command/t-test-paired-missing-list.sh
index 4f649bbbc6b3f45a9aee028b9cb86b4536acf2a0..47737121a2525a1a949b747c038bdcb54de5c6f9 100755
(executable)
--- a/
tests/command/t-test-paired-missing-list.sh
+++ b/
tests/command/t-test-paired-missing-list.sh
@@
-6,16
+6,26
@@
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$EXEEXT
# ensure that top_srcdir is absolute
# ensure that top_srcdir is absolute
-
cd $top_srcdir; top_srcdir=`
pwd`
+
top_srcdir=`cd $top_srcdir;
pwd`
-export STAT_CONFIG_PATH=$top_srcdir/config
+STAT_CONFIG_PATH=$top_srcdir/config
+export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ if [ x"$PSPP_TEST_NO_CLEANUP" != x ] ; then
+ echo "NOT cleaning $TEMPDIR"
+ return ;
+ fi
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-48,7
+58,7
@@
mkdir -p $TEMPDIR
cd $TEMPDIR
activity="create program 1"
cd $TEMPDIR
activity="create program 1"
-cat > $TE
MPDIR/out.stat
<<EOF
+cat > $TE
STFILE
<<EOF
data list list /id * a * b * c * d *.
begin data.
1 2.0 3.0 4.0 4.0
data list list /id * a * b * c * d *.
begin data.
1 2.0 3.0 4.0 4.0
@@
-64,15
+74,15
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program 1"
activity="run program 1"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $
PSPP -o pspp.csv $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="copy output"
if [ $? -ne 0 ] ; then no_result ; fi
activity="copy output"
-mv $TEMPDIR/pspp.
list $TEMPDIR/ref.list
+mv $TEMPDIR/pspp.
csv $TEMPDIR/ref.csv
if [ $? -ne 0 ] ; then no_result ; fi
activity="create program 2"
if [ $? -ne 0 ] ; then no_result ; fi
activity="create program 2"
-cat > $TE
MPDIR/out.stat
<<EOF
+cat > $TE
STFILE
<<EOF
data list list /id * a * b * c * d *.
begin data.
1 2.0 3.0 4.0 4.0
data list list /id * a * b * c * d *.
begin data.
1 2.0 3.0 4.0 4.0
@@
-90,12
+100,12
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program 2"
activity="run program 2"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii $TEMPDIR/out.stat
+$SUPERVISOR $
PSPP -o pspp.csv $TESTFILE
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare outputs"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare outputs"
-diff $TEMPDIR/ref.
list $TEMPDIR/pspp.list
+diff $TEMPDIR/ref.
csv $TEMPDIR/pspp.csv
if [ $? -ne 0 ] ; then fail ; fi
if [ $? -ne 0 ] ; then fail ; fi