projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use consistent orthography for "stock-id" property
[pspp]
/
tests
/
command
/
oneway-missing.sh
diff --git
a/tests/command/oneway-missing.sh
b/tests/command/oneway-missing.sh
index 661a1c004f3f37a8767022286f15f2e77635d927..5fe701b0a225270dafe7c41fa83dce55c2d154fa 100755
(executable)
--- a/
tests/command/oneway-missing.sh
+++ b/
tests/command/oneway-missing.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,11
@@
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
}
@@
-79,11
+88,11
@@
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$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"
-cp $TEMPDIR/pspp.
list $TEMPDIR/pspp.list
1
+cp $TEMPDIR/pspp.
csv $TEMPDIR/pspp.csv
1
if [ $? -ne 0 ] ; then no_result ; fi
activity="create program 2"
if [ $? -ne 0 ] ; then no_result ; fi
activity="create program 2"
@@
-117,11
+126,11
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program 2"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program 2"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$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/pspp.
list $TEMPDIR/pspp.list
1
+diff $TEMPDIR/pspp.
csv $TEMPDIR/pspp.csv
1
if [ $? -ne 0 ] ; then fail ; fi
# Now try a missing dependent variable
if [ $? -ne 0 ] ; then fail ; fi
# Now try a missing dependent variable
@@
-157,11
+166,11
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program 3"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program 3"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii
$TESTFILE
+$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/pspp.
list $TEMPDIR/pspp.list
1
+diff $TEMPDIR/pspp.
csv $TEMPDIR/pspp.csv
1
if [ $? -ne 0 ] ; then fail ; fi
if [ $? -ne 0 ] ; then fail ; fi