projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gtk_window_set_transient_for: Wrong argument order.
[pspp]
/
tests
/
bugs
/
val-labs.sh
diff --git
a/tests/bugs/val-labs.sh
b/tests/bugs/val-labs.sh
index 719a67350cba0723c045e7cf24b4f26568a07313..c287bde804209d45c1d951cbae356bbb58e94d7d 100755
(executable)
--- a/
tests/bugs/val-labs.sh
+++ b/
tests/bugs/val-labs.sh
@@
-7,10
+7,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
@@
-69,7
+73,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;