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
/
expressions
/
expressions.sh
diff --git
a/tests/expressions/expressions.sh
b/tests/expressions/expressions.sh
index a280988082a5128d25f89f938cc15cdb952534f1..9bfd90ca6fabf0c60dae2314ce4bba1546a6b657 100755
(executable)
--- a/
tests/expressions/expressions.sh
+++ b/
tests/expressions/expressions.sh
@@
-4,10
+4,14
@@
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`
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
STAT_CONFIG_PATH=$top_srcdir/config
export STAT_CONFIG_PATH
@@
-15,8
+19,8
@@
export STAT_CONFIG_PATH
cleanup()
{
cleanup()
{
+ cd /
rm -rf $TEMPDIR
rm -rf $TEMPDIR
- :
}
}
@@
-1298,14
+1302,14
@@
set mxerr 1000.' > $TEMPDIR/expr-opt.stat
sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-opt.stat \
-e 's#^\(\(.*\); \)*\(.*\) => .*$#DEBUG EVALUATE\2/\3.#'
if [ $? -ne 0 ] ; then no_result ; fi
sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-opt.stat \
-e 's#^\(\(.*\); \)*\(.*\) => .*$#DEBUG EVALUATE\2/\3.#'
if [ $? -ne 0 ] ; then no_result ; fi
-cp $TEMPDIR/expr-opt.stat ~/foo
activity="run optimizing program"
activity="run optimizing program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii \
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii \
$TEMPDIR/expr-opt.stat >$TEMPDIR/expr-opt.err 2> $TEMPDIR/expr-opt.out
activity="compare optimizing output"
$TEMPDIR/expr-opt.stat >$TEMPDIR/expr-opt.err 2> $TEMPDIR/expr-opt.out
activity="compare optimizing output"
-diff -B -b $TEMPDIR/expr-list $TEMPDIR/expr-opt.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/expr-list $TEMPDIR/expr-opt.out
+diff -b $TEMPDIR/expr-list $TEMPDIR/expr-opt.out
if [ $? -ne 0 ] ; then fail ; fi
activity="create non-optimizing input"
if [ $? -ne 0 ] ; then fail ; fi
activity="create non-optimizing input"
@@
-1316,11
+1320,12
@@
sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-noopt.stat \
if [ $? -ne 0 ] ; then no_result ; fi
activity="run non-optimizing program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run non-optimizing program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii \
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii \
$TEMPDIR/expr-noopt.stat >$TEMPDIR/expr-noopt.err 2> $TEMPDIR/expr-noopt.out
activity="compare non-optimizing output"
$TEMPDIR/expr-noopt.stat >$TEMPDIR/expr-noopt.err 2> $TEMPDIR/expr-noopt.out
activity="compare non-optimizing output"
-diff -B -b $TEMPDIR/expr-list $TEMPDIR/expr-noopt.out
+perl -pi -e 's/^\s*$//g' $TEMPDIR/expr-list $TEMPDIR/expr-noopt.out
+diff -b $TEMPDIR/expr-list $TEMPDIR/expr-noopt.out
if [ $? -ne 0 ] ; then fail ; fi
activity="create optimizing postfix input"
if [ $? -ne 0 ] ; then fail ; fi
activity="create optimizing postfix input"
@@
-1331,7
+1336,7
@@
sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-opt-pos.stat \
if [ $? -ne 0 ] ; then no_result ; fi
activity="run optimizing postfix program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run optimizing postfix program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii \
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii \
$TEMPDIR/expr-opt-pos.stat >$TEMPDIR/expr-opt-pos.err 2> $TEMPDIR/expr-opt-pos.out
if [ $? -eq 0 ] ; then no_result ; fi
$TEMPDIR/expr-opt-pos.stat >$TEMPDIR/expr-opt-pos.err 2> $TEMPDIR/expr-opt-pos.out
if [ $? -eq 0 ] ; then no_result ; fi
@@
-1343,7
+1348,7
@@
sed < $TEMPDIR/expr-list >> $TEMPDIR/expr-noopt-pos.stat \
if [ $? -ne 0 ] ; then no_result ; fi
activity="run non-optimizing postfix program"
if [ $? -ne 0 ] ; then no_result ; fi
activity="run non-optimizing postfix program"
-$SUPERVISOR $
here/../src/pspp
--testing-mode -o raw-ascii \
+$SUPERVISOR $
PSPP
--testing-mode -o raw-ascii \
$TEMPDIR/expr-noopt-pos.stat >$TEMPDIR/expr-noopt-pos.err 2> $TEMPDIR/expr-noopt-pos.out
if [ $? -eq 0 ] ; then no_result ; fi
$TEMPDIR/expr-noopt-pos.stat >$TEMPDIR/expr-noopt-pos.err 2> $TEMPDIR/expr-noopt-pos.out
if [ $? -eq 0 ] ; then no_result ; fi