projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Avoid use of $* in Makefile since it's problematic
[pspp-builds.git]
/
tests
/
bugs
/
val-labs.sh
diff --git
a/tests/bugs/val-labs.sh
b/tests/bugs/val-labs.sh
index b1e7abb0e689ec29e8bababc8a0ebc264386d6bf..4d57f661e79511acfb522e2ddd2f0590a91814d4 100755
(executable)
--- a/
tests/bugs/val-labs.sh
+++ b/
tests/bugs/val-labs.sh
@@
-7,16
+7,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
# 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
}
@@
-67,7
+77,7
@@
if [ $? -ne 0 ] ; then no_result ; fi
#Invalid syntax --- return value is non zero.
activity="run program"
#Invalid syntax --- return value is non zero.
activity="run program"
-$SUPERVISOR $
here/../src/pspp -o raw-ascii $TESTFILE > /dev/null
+$SUPERVISOR $
PSPP --testing-mode -e /dev/null $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
pass;
if [ $? -ne 1 ] ; then fail ; fi
pass;