From da2d2e19b10d136f4f25992e85abc47eb5e69dbe Mon Sep 17 00:00:00 2001 From: Alexandre Duret-Lutz Date: Fri, 21 May 2004 11:46:22 +0000 Subject: [PATCH] * src/sanity/80columns.test: Check the iface/ tree too. * iface/gspn/dcswaveltl.test, iface/gspn/dcswavefm.test, iface/gspn/dcswaveeltl.test, iface/gspn/udcsltl.test, iface/gspn/udcseltl.test, iface/gspn/udcsfm.test, iface/gspn/udcsefm.test: Wrap to fit 80 columns. --- ChangeLog | 8 ++++++++ iface/gspn/dcswaveeltl.test | 17 ++++++++++++----- iface/gspn/dcswavefm.test | 11 ++++++++--- iface/gspn/dcswaveltl.test | 11 ++++++++--- iface/gspn/udcsefm.test | 24 ++++++++++++++---------- iface/gspn/udcseltl.test | 24 ++++++++++++++---------- iface/gspn/udcsfm.test | 14 +++++++++----- iface/gspn/udcsltl.test | 14 +++++++++----- src/sanity/80columns.test | 27 +++++++++++++++------------ 9 files changed, 97 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1540ab90..e12d1966b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-05-21 Alexandre Duret-Lutz + + * src/sanity/80columns.test: Check the iface/ tree too. + * iface/gspn/dcswaveltl.test, iface/gspn/dcswavefm.test, + iface/gspn/dcswaveeltl.test, iface/gspn/udcsltl.test, + iface/gspn/udcseltl.test, iface/gspn/udcsfm.test, + iface/gspn/udcsefm.test: Wrap to fit 80 columns. + 2004-05-18 Alexandre Duret-Lutz * doc/Makefile.am (EXTRA_DIST, spot.html): Built the html diff --git a/iface/gspn/dcswaveeltl.test b/iface/gspn/dcswaveeltl.test index de4ad2809..cbeaca397 100755 --- a/iface/gspn/dcswaveeltl.test +++ b/iface/gspn/dcswaveeltl.test @@ -2,14 +2,21 @@ . ./defs || exit 1 +set -e + cp -R $srcdir/examples/DCSwave . chmod +w DCSwave # G(ATTiIDLj => F(!SCj U SCi)) is true -../ltlgspn-srg -c -l -e DCSwave/DCSWave '!G(ATTiIDLj => F(!SCj U SCi))' ATTiIDLj SCi SCj > output || exit 1 -../ltlgspn-srg -c -f -e2 DCSwave/DCSWave '!G(ATTiIDLj => F(!SCj U SCi))' ATTiIDLj SCi SCj > output || exit 1 +../ltlgspn-srg -c -l -e DCSwave/DCSWave \ + '!G(ATTiIDLj => F(!SCj U SCi))' ATTiIDLj SCi SCj >output +../ltlgspn-srg -c -f -e2 DCSwave/DCSWave \ + '!G(ATTiIDLj => F(!SCj U SCi))' ATTiIDLj SCi SCj >output # G(F(!SCj U SCi)) is false -../ltlgspn-srg -c -l -e DCSwave/DCSWave '!G(F(!SCj U SCi))' ATTiIDLj SCi SCj >output -../ltlgspn-srg -c -f -e2 DCSwave/DCSWave '!G(F(!SCj U SCi))' ATTiIDLj SCi SCj >output -test $? = 1 || exit 1 +../ltlgspn-srg -c -l -e DCSwave/DCSWave \ + '!G(F(!SCj U SCi))' ATTiIDLj SCi SCj >output && exit 1 +../ltlgspn-srg -c -f -e2 DCSwave/DCSWave \ + '!G(F(!SCj U SCi))' ATTiIDLj SCi SCj >output && exit 1 + +: diff --git a/iface/gspn/dcswavefm.test b/iface/gspn/dcswavefm.test index 4ccdc5749..30ca752a0 100755 --- a/iface/gspn/dcswavefm.test +++ b/iface/gspn/dcswavefm.test @@ -2,12 +2,17 @@ . ./defs || exit 1 +set -e + cp -R $srcdir/examples/DCSwave . chmod +w DCSwave # G(ATTiIDLj => F(!SCj U SCi)) is true -../ltlgspn-srg -c -f -m DCSwave/DCSWave '!G(ATTiIDLj => F(!SCj U SCi))' ATTiIDLj SCi SCj > output || exit 1 +../ltlgspn-srg -c -f -m DCSwave/DCSWave \ + '!G(ATTiIDLj => F(!SCj U SCi))' ATTiIDLj SCi SCj >output # G(F(!SCj U SCi)) is false -../ltlgspn-srg -c -f -m DCSwave/DCSWave '!G(F(!SCj U SCi))' ATTiIDLj SCi SCj > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -f -m DCSwave/DCSWave \ + '!G(F(!SCj U SCi))' ATTiIDLj SCi SCj >output && exit 1 + +: diff --git a/iface/gspn/dcswaveltl.test b/iface/gspn/dcswaveltl.test index 8dd7fc2ed..b0ebb23ea 100755 --- a/iface/gspn/dcswaveltl.test +++ b/iface/gspn/dcswaveltl.test @@ -2,12 +2,17 @@ . ./defs || exit 1 +set -e + cp -R $srcdir/examples/DCSwave . chmod +w DCSwave # G(ATTiIDLj => F(!SCj U SCi)) is true -../ltlgspn-srg -c -l -m DCSwave/DCSWave '!G(ATTiIDLj => F(!SCj U SCi))' ATTiIDLj SCi SCj > output || exit 1 +../ltlgspn-srg -c -l -m DCSwave/DCSWave \ + '!G(ATTiIDLj => F(!SCj U SCi))' ATTiIDLj SCi SCj >output # G(F(!SCj U SCi)) is false -../ltlgspn-srg -c -l -m DCSwave/DCSWave '!G(F(!SCj U SCi))' ATTiIDLj SCi SCj > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -l -m DCSwave/DCSWave \ + '!G(F(!SCj U SCi))' ATTiIDLj SCi SCj >output && exit 1 + +: diff --git a/iface/gspn/udcsefm.test b/iface/gspn/udcsefm.test index 314e9eba2..53d0ab17c 100755 --- a/iface/gspn/udcsefm.test +++ b/iface/gspn/udcsefm.test @@ -2,21 +2,25 @@ . ./defs || exit 1 +set -e + cp -R $srcdir/examples/udcs . chmod +w udcs # F(ReP1 => F(gsP1)) is false -../ltlgspn-srg -c -f -e udcs/udcs 'F(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 -../ltlgspn-srg -c -f -e2 udcs/udcs 'F(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -f -e udcs/udcs \ + 'F(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 +../ltlgspn-srg -c -f -e2 udcs/udcs \ + 'F(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 # !F(ReP1 => F(gsP1)) is true -../ltlgspn-srg -c -f -e udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 > output || exit 1 -../ltlgspn-srg -c -f -e2 udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 > output || exit 1 +../ltlgspn-srg -c -f -e udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 >output +../ltlgspn-srg -c -f -e2 udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 >output # !G(ReP1 => F(gsP1)) is false -../ltlgspn-srg -c -f -e udcs/udcs '!G(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 -../ltlgspn-srg -c -f -e2 udcs/udcs '!G(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -f -e udcs/udcs \ + '!G(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 +../ltlgspn-srg -c -f -e2 udcs/udcs \ + '!G(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 + +: diff --git a/iface/gspn/udcseltl.test b/iface/gspn/udcseltl.test index 02c01260e..1489e9e39 100755 --- a/iface/gspn/udcseltl.test +++ b/iface/gspn/udcseltl.test @@ -2,21 +2,25 @@ . ./defs || exit 1 +set -e + cp -R $srcdir/examples/udcs . chmod +w udcs # F(ReP1 => F(gsP1)) is false -../ltlgspn-srg -c -l -e udcs/udcs 'F(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 -../ltlgspn-srg -c -l -e2 udcs/udcs 'F(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -l -e udcs/udcs \ + 'F(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 +../ltlgspn-srg -c -l -e2 udcs/udcs \ + 'F(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 # !F(ReP1 => F(gsP1)) is true -../ltlgspn-srg -c -l -e udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 > output || exit 1 -../ltlgspn-srg -c -l -e2 udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 > output || exit 1 +../ltlgspn-srg -c -l -e udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 >output +../ltlgspn-srg -c -l -e2 udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 >output # !G(ReP1 => F(gsP1)) is false -../ltlgspn-srg -c -l -e udcs/udcs '!G(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 -../ltlgspn-srg -c -l -e2 udcs/udcs '!G(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -l -e udcs/udcs \ + '!G(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 +../ltlgspn-srg -c -l -e2 udcs/udcs \ + '!G(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 + +: diff --git a/iface/gspn/udcsfm.test b/iface/gspn/udcsfm.test index e1c979f0c..caa48e446 100755 --- a/iface/gspn/udcsfm.test +++ b/iface/gspn/udcsfm.test @@ -2,16 +2,20 @@ . ./defs || exit 1 +set -e + cp -R $srcdir/examples/udcs . chmod +w udcs # F(ReP1 => F(gsP1)) is false -../ltlgspn-srg -c -f -m udcs/udcs 'F(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -f -m udcs/udcs \ + 'F(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 # !F(ReP1 => F(gsP1)) is true -../ltlgspn-srg -c -f -m udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 > output || exit 1 +../ltlgspn-srg -c -f -m udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 >output # !G(ReP1 => F(gsP1)) is false -../ltlgspn-srg -c -f -m udcs/udcs '!G(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -f -m udcs/udcs \ + '!G(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 + +: diff --git a/iface/gspn/udcsltl.test b/iface/gspn/udcsltl.test index e57af8ff4..388936c67 100755 --- a/iface/gspn/udcsltl.test +++ b/iface/gspn/udcsltl.test @@ -2,16 +2,20 @@ . ./defs || exit 1 +set -e + cp -R $srcdir/examples/udcs . chmod +w udcs # F(ReP1 => F(gsP1)) is false -../ltlgspn-srg -c -l -m udcs/udcs 'F(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -l -m udcs/udcs \ + 'F(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 # !F(ReP1 => F(gsP1)) is true -../ltlgspn-srg -c -l -m udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 > output || exit 1 +../ltlgspn-srg -c -l -m udcs/udcs '!F(ReP1 => F(gsP1))' ReP1 gsP1 >output # !G(ReP1 => F(gsP1)) is false -../ltlgspn-srg -c -l -m udcs/udcs '!G(ReP1 => F(gsP1))' ReP1 gsP1 > output -test $? = 1 || exit 1 +../ltlgspn-srg -c -l -m udcs/udcs \ + '!G(ReP1 => F(gsP1))' ReP1 gsP1 >output && exit 1 + +: diff --git a/src/sanity/80columns.test b/src/sanity/80columns.test index ad373ae1a..31231d12b 100755 --- a/src/sanity/80columns.test +++ b/src/sanity/80columns.test @@ -6,18 +6,21 @@ set -e rm -f failures -find "${INCDIR-..}" \( -name "${1-*}.hh" -o -name "${1-*}.cc" \ - -o -name "${1-*}.test" \) -a -type f -a -print | -while read file; do - x='.........................................' - if grep -q $x$x "$file"; then - if grep 'GNU Bison' "$file" >/dev/null || - grep 'generated by flex' "$file" >/dev/null ; then - : - else - echo "$file" >>failures - fi - fi +for dir in "${INCDIR-..}" "${INCDIR-..}"/../iface; do + + find "$dir" \( -name "${1-*}.hh" -o -name "${1-*}.cc" \ + -o -name "${1-*}.test" \) -a -type f -a -print | + while read file; do + x='.........................................' + if grep -q $x$x "$file"; then + if grep 'GNU Bison' "$file" >/dev/null || + grep 'generated by flex' "$file" >/dev/null ; then + : + else + echo "$file" >>failures + fi + fi + done done if test -f failures; then