projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed some bad interaction between variable and data sheets.
[pspp]
/
tests
/
xforms
/
casefile.sh
diff --git
a/tests/xforms/casefile.sh
b/tests/xforms/casefile.sh
index 015ce8c6f2c536c17f1b5a900b39ce9163f2cd17..46e97eab76e86ca332b664a0b3b7d80605bbfbb9 100755
(executable)
--- a/
tests/xforms/casefile.sh
+++ b/
tests/xforms/casefile.sh
@@
-4,16
+4,22
@@
TEMPDIR=/tmp/pspp-tst-$$
TEMPDIR=/tmp/pspp-tst-$$
-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()
{
+ cd /
rm -rf $TEMPDIR
}
rm -rf $TEMPDIR
}
@@
-52,11
+58,12
@@
EOF
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode $TEMPDIR/casefile.stat > $TEMPDIR/casefile.out
+$SUPERVISOR $
PSPP
--testing-mode $TEMPDIR/casefile.stat > $TEMPDIR/casefile.out
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
if [ $? -ne 0 ] ; then no_result ; fi
activity="compare results"
-diff -b -B $TEMPDIR/casefile.out - <<EOF
+perl -pi -e 's/^\s*$//g' $TEMPDIR/casefile.out
+diff -b $TEMPDIR/casefile.out - <<EOF
Casefile tests succeeded.
EOF
Casefile tests succeeded.
EOF