projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make psppire_sheet_get_attributes a private function
[pspp]
/
tests
/
bugs
/
val-labs.sh
diff --git
a/tests/bugs/val-labs.sh
b/tests/bugs/val-labs.sh
index fc052b7b86bc1189177d912431e0003c3cd5479c..4d57f661e79511acfb522e2ddd2f0590a91814d4 100755
(executable)
--- a/
tests/bugs/val-labs.sh
+++ b/
tests/bugs/val-labs.sh
@@
-5,17
+5,28
@@
TEMPDIR=/tmp/pspp-tst-$$
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
}
@@
-48,7
+59,7
@@
mkdir -p $TEMPDIR
cd $TEMPDIR
activity="create program"
cd $TEMPDIR
activity="create program"
-cat > $TE
MPDIR/rnd.sps
<<EOF
+cat > $TE
STFILE
<<EOF
DATA LIST LIST /a * pref * .
BEGIN DATA.
1.00 1.00
DATA LIST LIST /a * pref * .
BEGIN DATA.
1.00 1.00
@@
-64,7
+75,9
@@
VALUE LABELS /var=a 'label for a'.
EOF
if [ $? -ne 0 ] ; then no_result ; fi
EOF
if [ $? -ne 0 ] ; then no_result ; fi
-$SUPERVISOR $here/../src/pspp -o raw-ascii $TEMPDIR/rnd.sps > /dev/null
+#Invalid syntax --- return value is non zero.
+activity="run program"
+$SUPERVISOR $PSPP --testing-mode -e /dev/null $TESTFILE
if [ $? -ne 1 ] ; then fail ; fi
pass;
if [ $? -ne 1 ] ; then fail ; fi
pass;