projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix change log.
[pspp]
/
tests
/
xforms
/
expressions.sh
diff --git
a/tests/xforms/expressions.sh
b/tests/xforms/expressions.sh
index 12eb56e7a7aca77004ed75fc8006a7e5c1ff2704..5a6d9f60fcf2a31eaa613205be7616a2f845d1ff 100755
(executable)
--- a/
tests/xforms/expressions.sh
+++ b/
tests/xforms/expressions.sh
@@
-4,10
+4,13
@@
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`
# 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
@@
-1003,12
+1006,13
@@
for d in *.expr; do
# Run.
activity="$base, $optimize: run program"
# Run.
activity="$base, $optimize: run program"
- $SUPERVISOR $
here/..
/src/pspp --testing-mode -o raw-ascii \
+ $SUPERVISOR $
top_builddir
/src/pspp --testing-mode -o raw-ascii \
$base.$optimize.stat > $base.$optimize.err 2> $base.$optimize.out
# Compare.
activity="$base, $optimize: compare output"
$base.$optimize.stat > $base.$optimize.err 2> $base.$optimize.out
# Compare.
activity="$base, $optimize: compare output"
- diff -B -b $base.clean $base.$optimize.out
+ perl -pi -e 's/^\s*$//g' $base.clean $base.$optimize.out
+ diff -b $base.clean $base.$optimize.out
if [ $? -ne 0 ] ; then fail ; fi
done
num=`echo $d | sed 's/-.*//'`
if [ $? -ne 0 ] ; then fail ; fi
done
num=`echo $d | sed 's/-.*//'`