From 9c4e9c896f390a03105c0bde66af0849ea3fbfe4 Mon Sep 17 00:00:00 2001 From: Thomas Badie Date: Mon, 28 Jan 2013 22:04:19 +0100 Subject: [PATCH] Fix some VPATH related bugs. * bench/ltl2tgba/defs.in (LTLFILT): Add this variable. * bench/ltl2tgba/big, bench/ltl2tgba/small: Use $LTLFILT. * bench/ltl2tgba/known: Add a missing '$srcdir'. --- bench/ltl2tgba/big | 2 +- bench/ltl2tgba/defs.in | 1 + bench/ltl2tgba/known | 3 ++- bench/ltl2tgba/small | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bench/ltl2tgba/big b/bench/ltl2tgba/big index ad29f1118..e1e7f5fd4 100755 --- a/bench/ltl2tgba/big +++ b/bench/ltl2tgba/big @@ -21,5 +21,5 @@ . ./defs . "$srcdir/algorithms" -$RANDLTL -n 100 --tree-size=15..20 p1 p2 p3 p4 p5 p6 p7 p8 | ltlfilt --nnf | +$RANDLTL -n 100 --tree-size=15..20 p1 p2 p3 p4 p5 p6 p7 p8 | $LTLFILT --nnf | $LTLCROSS "$@" --csv=big.csv --json=big.json 2>&1 | tee big.log diff --git a/bench/ltl2tgba/defs.in b/bench/ltl2tgba/defs.in index 3abaa021a..cc4543111 100644 --- a/bench/ltl2tgba/defs.in +++ b/bench/ltl2tgba/defs.in @@ -37,6 +37,7 @@ test -f "$srcdir/defs.in" || { top_builddir="@top_builddir@" LBT="@LBT@" LTLCROSS="$top_builddir/src/bin/ltlcross@EXEEXT@" +LTLFILT="$top_builddir/src/bin/ltlfilt@EXEEXT@" RANDLTL="$top_builddir/src/bin/randltl@EXEEXT@" LTL2BA="@LTL2BA@" LTL3BA="@LTL3BA@" diff --git a/bench/ltl2tgba/known b/bench/ltl2tgba/known index ff20c72e6..f1bd3fb55 100755 --- a/bench/ltl2tgba/known +++ b/bench/ltl2tgba/known @@ -21,5 +21,6 @@ . ./defs . "$srcdir/algorithms" -$LTLCROSS "$@" --csv=known.csv --json=known.json < formulae.ltl 2>&1 | +$LTLCROSS "$@" --csv=known.csv --json=known.json \ + < "$srcdir/formulae.ltl" 2>&1 | tee known.log diff --git a/bench/ltl2tgba/small b/bench/ltl2tgba/small index e242d44ee..d5995f3a8 100755 --- a/bench/ltl2tgba/small +++ b/bench/ltl2tgba/small @@ -21,5 +21,5 @@ . ./defs . "$srcdir/algorithms" -$RANDLTL -n 100 --tree-size=10 p1 p2 p3 p4 | ltlfilt --nnf | +$RANDLTL -n 100 --tree-size=10 p1 p2 p3 p4 | $LTLFILT --nnf | $LTLCROSS "$@" --csv=small.csv --json=small.json 2>&1 | tee small.log