XRM r97: Autotoolize the test suite.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Repository: https://svn.lrde.epita.fr/svn/xrm ChangeLog: 2006-12-14 SIGOURE Benoit <sigoure.benoit@lrde.epita.fr> Autotoolize the test suite. * src/tools/Makefile.am, * src/sig/Makefile.am, * src/lib/pctl/pp/Makefile.am, * src/lib/xrm/pp/Makefile.am, * src/lib/native/Makefile.am, * src/lib/prism/pp/Makefile.am, * src/syn/xpctl/Makefile.am, * src/str/Makefile.am, * src/syn/pctl/Makefile.am, * src/syn/xrm/Makefile.am, * src/syn/prism/Makefile.am, * src/lib/xpctl/pp/Makefile.am: Include Makefile.xt instead of Transformers.mk. * Makefile.am: Put the equivalant of toplevel.mk here. * config/Makefile.am: Adjust. * config/Transformers.mk: Remove. * config/toplevel.mk: Remove. * configure.ac: Add new Makefiles. * src/Makefile.am: Don't include toplevel.mk. * src/lib/prism/pp/prism-conflicts.str: Handle the fact that PRISM doesn't support unary operators. * tests/Makefile.am: Add new subdirs. * tests/gen_tests.sh: New. * tests/make-tests.mk: New. * tests/pctl/Makefile.am: New. * tests/prism/Makefile.am: New. * tests/prism/prism-examples/Makefile.am: New. * tests/prism/prism-examples/brp/Makefile.am: New. * tests/prism/prism-examples/cell/Makefile.am: New. * tests/prism/prism-examples/cluster/Makefile.am: New. * tests/prism/prism-examples/dice/Makefile.am: New. * tests/prism/prism-examples/embedded/Makefile.am: New. * tests/prism/prism-examples/firewire/abst/Makefile.am: New. * tests/prism/prism-examples/firewire/impl/Makefile.am: New. * tests/prism/prism-examples/fms/Makefile.am: New. * tests/prism/prism-examples/kanban/Makefile.am: New. * tests/prism/prism-examples/leader/asynchronous/Makefile.am: New. * tests/prism/prism-examples/leader/synchronous/Makefile.am: New. * tests/prism/prism-examples/molecules/Makefile.am: New. * tests/prism/prism-examples/mutual/Makefile.am: New. * tests/prism/prism-examples/pepa/Makefile.am: New. * tests/prism/prism-examples/phil/nofair/Makefile.am: New. * tests/prism/prism-examples/phil/original/Makefile.am: New. * tests/prism/prism-examples/phil_lss/Makefile.am: New. * tests/prism/prism-examples/polling/Makefile.am: New. * tests/prism/prism-examples/rabin/Makefile.am: New. * tests/prism/prism-examples/self-stabilisation/beauquier/Makefile.am: New. * tests/prism/prism-examples/self-stabilisation/herman/Makefile.am: New. * tests/prism/prism-examples/self-stabilisation/israeli-jalfon/Makefile.am: New. * tests/prism/prism-examples/tandem/Makefile.am: New. * tests/xrm/Makefile.am: New. * tests/test-parse-pctl.sh.in, * tests/test-parse-prism.sh.in, * tests/test-parse-xpctl.sh.in, * tests/test-parse-xrm.sh.in: Factor in test-parser.sh.in. * tests/test-parser.sh.in: New. * tests/test-pp-pctl.sh.in, * tests/test-pp-prism.sh.in, * tests/test-pp-xpctl.sh.in, * tests/test-pp-xrm.sh.in: Factor in test-pp.sh.in. * tests/test-pp.sh.in: New. * tests/test-xrm-front.sh.in: Tweak to handle one test at a time. Makefile.am | 16 config/Makefile.am | 2 configure.ac | 34 + src/Makefile.am | 3 src/lib/native/Makefile.am | 5 src/lib/pctl/pp/Makefile.am | 3 src/lib/prism/pp/Makefile.am | 3 src/lib/prism/pp/prism-conflicts.str | 10 src/lib/xpctl/pp/Makefile.am | 3 src/lib/xrm/pp/Makefile.am | 3 src/sig/Makefile.am | 3 src/str/Makefile.am | 5 src/syn/pctl/Makefile.am | 3 src/syn/prism/Makefile.am | 3 src/syn/xpctl/Makefile.am | 3 src/syn/xrm/Makefile.am | 3 src/tools/Makefile.am | 3 tests/Makefile.am | 27 - tests/gen_tests.sh | 25 + tests/make-tests.mk | 37 + tests/pctl/Makefile.am | 42 + tests/prism/Makefile.am | 80 +++ tests/prism/prism-examples/Makefile.am | 45 ++ tests/prism/prism-examples/brp/Makefile.am | 32 + tests/prism/prism-examples/cell/Makefile.am | 32 + tests/prism/prism-examples/cluster/Makefile.am | 32 + tests/prism/prism-examples/dice/Makefile.am | 48 ++ tests/prism/prism-examples/embedded/Makefile.am | 36 + tests/prism/prism-examples/firewire/abst/Makefile.am | 40 + tests/prism/prism-examples/firewire/impl/Makefile.am | 40 + tests/prism/prism-examples/fms/Makefile.am | 32 + tests/prism/prism-examples/kanban/Makefile.am | 32 + tests/prism/prism-examples/leader/asynchronous/Makefile.am | 122 +++++ tests/prism/prism-examples/leader/synchronous/Makefile.am | 220 ++++++++++ tests/prism/prism-examples/molecules/Makefile.am | 48 ++ tests/prism/prism-examples/mutual/Makefile.am | 64 ++ tests/prism/prism-examples/pepa/Makefile.am | 20 tests/prism/prism-examples/phil/nofair/Makefile.am | 84 +++ tests/prism/prism-examples/phil/original/Makefile.am | 120 +++++ tests/prism/prism-examples/phil_lss/Makefile.am | 40 + tests/prism/prism-examples/polling/Makefile.am | 104 ++++ tests/prism/prism-examples/rabin/Makefile.am | 86 +++ tests/prism/prism-examples/self-stabilisation/beauquier/Makefile.am | 76 +++ tests/prism/prism-examples/self-stabilisation/herman/Makefile.am | 126 +++++ tests/prism/prism-examples/self-stabilisation/israeli-jalfon/Makefile.am | 176 ++++++++ tests/prism/prism-examples/tandem/Makefile.am | 32 + tests/test-parse-pctl.sh.in | 31 - tests/test-parse-prism.sh.in | 31 - tests/test-parse-xpctl.sh.in | 31 - tests/test-parse-xrm.sh.in | 31 - tests/test-parser.sh.in | 44 +- tests/test-pp-pctl.sh.in | 106 ---- tests/test-pp-prism.sh.in | 106 ---- tests/test-pp-xpctl.sh.in | 106 ---- tests/test-pp-xrm.sh.in | 106 ---- tests/test-pp.sh.in | 168 +++++-- tests/test-xrm-front.sh.in | 64 ++ tests/xrm/Makefile.am | 120 +++++ 58 files changed, 2330 insertions(+), 617 deletions(-) Index: src/tools/Makefile.am =================================================================== - --- src/tools/Makefile.am (revision 96) +++ src/tools/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/Transformers.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) bin_PROGRAMS = \ Index: src/sig/Makefile.am =================================================================== - --- src/sig/Makefile.am (revision 96) +++ src/sig/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/Transformers.mk +include $(top_srcdir)/config/Makefile.xt pkgdata_DATA = PRISM.rtg PRISM.str \ PCTL.rtg PCTL.str \ Index: src/lib/pctl/pp/Makefile.am =================================================================== - --- src/lib/pctl/pp/Makefile.am (revision 96) +++ src/lib/pctl/pp/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/toplevel.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) pkgdata_DATA = pctl-parenthesize.str Index: src/lib/xrm/pp/Makefile.am =================================================================== - --- src/lib/xrm/pp/Makefile.am (revision 96) +++ src/lib/xrm/pp/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/toplevel.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) pkgdata_DATA = xrm-parenthesize.str Index: src/lib/native/Makefile.am =================================================================== - --- src/lib/native/Makefile.am (revision 96) +++ src/lib/native/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/toplevel.mk +include $(top_srcdir)/config/Makefile.xt lib_LTLIBRARIES = libstr-reals.la include_HEADERS = libstr-reals.h @@ -36,7 +35,7 @@ CLEANFILES = $(BUILT_SOURCES) - -import-libstr-reals.c: Makefile +import-libstr-reals.c: Makefile.am echo "/* code generated; used for strc --C-include \"'$@'\" */" > $@ for f in $(libstr_reals_la_SOURCES); do \ echo "#include \"$$f\"" >> $@; \ Index: src/lib/prism/pp/prism-conflicts.str =================================================================== - --- src/lib/prism/pp/prism-conflicts.str (revision 96) +++ src/lib/prism/pp/prism-conflicts.str (working copy) @@ -21,8 +21,13 @@ rules + // Remove unary operators (they are not supported by PRISM's parser) very-special-conflict: - - Minus(Minus(e)) -> Minus(Parenthetical(Minus(e))) + Plus(e) -> Parenthetical(e) + + // Remove unary operators (they are not supported by PRISM's parser) + very-special-conflict: + Minus(e) -> Parenthetical(Minus(Int("0"), e)) // FIXME: Remove this rule once tests/xrm/amb-if-exp.xpm succeeds // in parse-xrm @@ -43,6 +48,3 @@ very-special-conflict: If(c, then-part@"If"#(_), else-part@"If"#(_)) -> If(c, Parenthetical(then-part), Parenthetical(else-part)) - - - - very-special-conflict: - - Plus(Plus(e)) -> Plus(Parenthetical(Plus(e))) Index: src/lib/prism/pp/Makefile.am =================================================================== - --- src/lib/prism/pp/Makefile.am (revision 96) +++ src/lib/prism/pp/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/toplevel.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) pkgdata_DATA = prism-parenthesize.str Index: src/lib/xpctl/pp/Makefile.am =================================================================== - --- src/lib/xpctl/pp/Makefile.am (revision 96) +++ src/lib/xpctl/pp/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/toplevel.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) pkgdata_DATA = xpctl-parenthesize.str Index: src/str/Makefile.am =================================================================== - --- src/str/Makefile.am (revision 96) +++ src/str/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/Transformers.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) bin_PROGRAMS = xrm-front @@ -29,7 +28,7 @@ -I $(top_builddir)/src/sig \ -I $(top_builddir)/src/syn/xrm \ --C-include '"$(top_builddir)/src/lib/native/import-libstr-reals.c"' - -AM_CFLAGS = -I$(top_srcdir)/src/lib/native +AM_CFLAGS += -I$(top_srcdir)/src/lib/native LDADD += $(SSL_LIBS) Index: src/syn/pctl/Makefile.am =================================================================== - --- src/syn/pctl/Makefile.am (revision 96) +++ src/syn/pctl/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/Transformers.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) PGEN_FLAGS = -m $* Index: src/syn/xrm/Makefile.am =================================================================== - --- src/syn/xrm/Makefile.am (revision 96) +++ src/syn/xrm/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/Transformers.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) PGEN_FLAGS = -m $* Index: src/syn/prism/Makefile.am =================================================================== - --- src/syn/prism/Makefile.am (revision 96) +++ src/syn/prism/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/Transformers.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) PGEN_FLAGS = -m $* Index: src/syn/xpctl/Makefile.am =================================================================== - --- src/syn/xpctl/Makefile.am (revision 96) +++ src/syn/xpctl/Makefile.am (working copy) @@ -17,8 +17,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/Transformers.mk +include $(top_srcdir)/config/Makefile.xt -include $(wildcard *.dep) PGEN_FLAGS = -m $* Index: src/Makefile.am =================================================================== - --- src/Makefile.am (revision 96) +++ src/Makefile.am (working copy) @@ -17,7 +17,4 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/toplevel.mk - - SUBDIRS = syn sig lib str tools Index: tests/make-tests.mk =================================================================== - --- tests/make-tests.mk (revision 0) +++ tests/make-tests.mk (revision 0) @@ -0,0 +1,37 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +# Set the XTC_REPOSITORY environment variable so that we override the XTC +# repos used to lookup the tools we're building. We need this because our XTC +# repos might not yet be installed (make all check install) and the tool we're +# testing will expect to find it in the place were it will be installed. Hence +# the need to override the location of that very repository :) +TESTS_ENVIRONMENT = XTC_REPOSITORY="$(BUILD_REPOSITORY)" \ + top_builddir=$(top_builddir) \ + srcdir=$(srcdir) + +$(TESTS): + for i in $(TESTS); do \ + prog=`basename "$$i" | sed 's/\([^_]*\)_..*.test/\1/'`; \ + test -x "$(top_builddir)/tests/test-$$prog.sh" || exit 42; \ + echo $(LN_S) -f $(top_builddir)/tools/test-$$prog.sh $$i; \ + $(LN_S) -f $(top_builddir)/tests/test-$$prog.sh $$i || exit 1; \ + done + +CLEANFILES = *.test Index: tests/test-parser.sh.in =================================================================== - --- tests/test-parser.sh.in (revision 96) +++ tests/test-parser.sh.in (working copy) @@ -18,15 +18,46 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +test x"$DEBUG" != x && set -x +me=`basename "$0"` + +parser=$1 +test -x "$parser" || { + echo "$me: Cannot find the parser $parser" >&2 + exit 1 +} +shift + +extensions=$1 +test x"$extensions" = x && { + echo "Usage: $me <parser> <extensions> [file] +eg: $me parse-foo foo,bar +Will run parse-foo on *.foo and *.bar in srcdir" >&2 + exit 1 +} +shift + +sed_ext='s/^/-name *./;s/,/ -o -name *./g' +extensions=`echo "$extensions" | sed "$sed_ext"` + +: ${srcdir=@srcdir@} + +if [ x"$1" != x ]; then + test -f "$1" || { + echo "$me: Error: '$1' no such file or directory." >&2 + exit 1 + } + test x"$VERBOSE" = x && exec 2>/dev/null + exec "$parser" -i "$1" -o /dev/null + exit 42 +fi test_cnt=0 test_pass=0 - -srcdir='@srcdir@' - -rm -f failed_tests.$$ - -for file in `find "$srcdir" -name '*.pm' -o -name '*.nm' -o -name '*.sm' -o -name '*.xrm' | sort`; do +for file in `find "$srcdir" $extensions | sort`; do echo @ECHO_N@ " Parsing `basename $file` ... " - - "@top_builddir@/src/tools/parse-xrm" -i "$file" -o /dev/null + "$parser" -i "$file" -o /dev/null rv=$? test_cnt=$((test_cnt + 1)) if [ $rv -eq 0 ]; then @@ -37,9 +68,6 @@ continue fi done - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -f failed_tests.$$ +echo "`basename $parser`: $test_pass/$test_cnt tests passed" test $test_pass -eq $test_cnt Index: tests/test-xrm-front.sh.in =================================================================== - --- tests/test-xrm-front.sh.in (revision 96) +++ tests/test-xrm-front.sh.in (working copy) @@ -18,12 +18,27 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +test x"$DEBUG" != x && set -x +: ${top_builddir=@top_builddir@} +testname=`echo "$0" | sed 's/^[^_]*_\(..*\)\.test$/\1/'` +test -f "$testname" && set dummy "$testname" && shift +test -f "$srcdir/$testname" && set dummy "$srcdir/$testname" && shift + +# run cmd +run() +{ + "$@" || { + rv=$? + echo "Failed to run $* (return value: $rv)" >&2 + exit $rv + } +} + +# Get the extension of a file. +sed_get_ext='s/^.*\.\([^.]*\)$/\1/' +sed_remove_ext='s/^\(.*\)\.[^.]*$/\1/' - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' target_dir='output-xrm-front' - -rm -f failed_tests.$$ test ! -d $target_dir && { mkdir $target_dir \ || { echo "Cannot create $target_dir/ directory" && exit 1; } } @@ -32,39 +47,61 @@ outdir="`pwd`" cd .. +if [ x"$1" != x ]; then + test -f "$1" || { + echo "$0: Error: '$1' no such file or directory." >&2 + exit 1 + } + + file=$1 + basefile=`basename "$file"` + bfile=`echo "$basefile" | sed "$sed_remove_ext"` + this_ext=`echo "$basefile" | sed "$sed_get_ext"` + + test x"$VERBOSE" = x && exec 2>/dev/null + run "$top_builddir/src/str/xrm-front" -A -po /dev/null \ + -i "$file" -o "$outdir/$bfile.pm.aterm" + run "$top_builddir/src/str/xrm-front" -po /dev/null \ + -i "$file" -o "$outdir/$bfile.pm" + run "$top_builddir/src/tools/parse-prism" -A \ + -i "$outdir/$bfile.pm" -o "$outdir/$bfile.pm2.aterm" + exit 0 +fi + +test_cnt=0 +test_pass=0 +: ${srcdir=@srcdir@} + for file in `find "$srcdir" -name '*.xrm' | sort`; do - - basefile="`basename $file`" - - bfile="`echo \"$basefile\" | sed 's/\.\(xrm\|pm\)$//'`" + basefile=`basename $file` + bfile=`echo "$basefile" | sed 's/\.\(xrm\|pm\)$//'` echo ">>> Starting the test for $basefile" test_cnt=$((test_cnt + 1)) echo @ECHO_N@ " Converting $basefile into standard PRISM AST... " - - "@top_builddir@/src/str/xrm-front" -A -po /dev/null \ + "$top_builddir/src/str/xrm-front" -A -po /dev/null \ -i "$file" -o "$outdir/$bfile.pm.aterm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' - - echo " * $file: xrm-front failed (-A) FAILED" >> failed_tests.$$ continue fi echo 'OK' echo @ECHO_N@ " Converting $basefile into standard PRISM code ... " - - "@top_builddir@/src/str/xrm-front" -po /dev/null \ + "$top_builddir/src/str/xrm-front" -po /dev/null \ -i "$file" -o "$outdir/$bfile.pm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' - - echo " * $file: xrm-front failed FAILED" >> failed_tests.$$ continue fi echo 'OK' echo @ECHO_N@ " Re-Parsing generated PRISM code for $basefile ... " - - "@top_builddir@/src/tools/parse-prism" -A \ + "$top_builddir/src/tools/parse-prism" -A \ -i "$outdir/$bfile.pm" -o "$outdir/$bfile.pm2.aterm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' - - echo " * $file: re-parsing FAILED" >> failed_tests.$$ continue fi echo 'OK, no ambiguities found' @@ -74,8 +111,5 @@ done echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -rf failed_tests.$$ "$outdir" test $test_pass -eq $test_cnt Index: tests/prism/prism-examples/cell/Makefile.am =================================================================== - --- tests/prism/prism-examples/cell/Makefile.am (revision 0) +++ tests/prism/prism-examples/cell/Makefile.am (revision 0) @@ -0,0 +1,32 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_cell.sm.test \ +pp-prism_cell.sm.test \ +parse-pctl_cell.csl.test \ +pp-pctl_cell.csl.test \ +parse-xpctl_cell.csl.test \ +pp-xpctl_cell.csl.test \ +parse-xrm_cell.sm.test \ +pp-xrm_cell.sm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/cluster/Makefile.am =================================================================== - --- tests/prism/prism-examples/cluster/Makefile.am (revision 0) +++ tests/prism/prism-examples/cluster/Makefile.am (revision 0) @@ -0,0 +1,32 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_cluster.sm.test \ +pp-prism_cluster.sm.test \ +parse-pctl_cluster.csl.test \ +pp-pctl_cluster.csl.test \ +parse-xpctl_cluster.csl.test \ +pp-xpctl_cluster.csl.test \ +parse-xrm_cluster.sm.test \ +pp-xrm_cluster.sm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/brp/Makefile.am =================================================================== - --- tests/prism/prism-examples/brp/Makefile.am (revision 0) +++ tests/prism/prism-examples/brp/Makefile.am (revision 0) @@ -0,0 +1,32 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_brp.pm.test \ +pp-prism_brp.pm.test \ +parse-pctl_brp.pctl.test \ +pp-pctl_brp.pctl.test \ +parse-xpctl_brp.pctl.test \ +pp-xpctl_brp.pctl.test \ +parse-xrm_brp.pm.test \ +pp-xrm_brp.pm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/pepa/Makefile.am =================================================================== - --- tests/prism/prism-examples/pepa/Makefile.am (revision 0) +++ tests/prism/prism-examples/pepa/Makefile.am (revision 0) @@ -0,0 +1,20 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +EXTRA_DIST = auto badge.pepa PC-LAN4.pepa PC-LAN6.pepa README Index: tests/prism/prism-examples/fms/Makefile.am =================================================================== - --- tests/prism/prism-examples/fms/Makefile.am (revision 0) +++ tests/prism/prism-examples/fms/Makefile.am (revision 0) @@ -0,0 +1,32 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_fms.sm.test \ +pp-prism_fms.sm.test \ +parse-pctl_fms.csl.test \ +pp-pctl_fms.csl.test \ +parse-xpctl_fms.csl.test \ +pp-xpctl_fms.csl.test \ +parse-xrm_fms.sm.test \ +pp-xrm_fms.sm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/molecules/Makefile.am =================================================================== - --- tests/prism/prism-examples/molecules/Makefile.am (revision 0) +++ tests/prism/prism-examples/molecules/Makefile.am (revision 0) @@ -0,0 +1,48 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_knacl.sm.test \ +parse-prism_mc.sm.test \ +parse-prism_nacl.sm.test \ +pp-prism_knacl.sm.test \ +pp-prism_mc.sm.test \ +pp-prism_nacl.sm.test \ +parse-pctl_knacl.csl.test \ +parse-pctl_mc.csl.test \ +parse-pctl_nacl.csl.test \ +pp-pctl_knacl.csl.test \ +pp-pctl_mc.csl.test \ +pp-pctl_nacl.csl.test \ +parse-xpctl_knacl.csl.test \ +parse-xpctl_mc.csl.test \ +parse-xpctl_nacl.csl.test \ +pp-xpctl_knacl.csl.test \ +pp-xpctl_mc.csl.test \ +pp-xpctl_nacl.csl.test \ +parse-xrm_knacl.sm.test \ +parse-xrm_mc.sm.test \ +parse-xrm_nacl.sm.test \ +pp-xrm_knacl.sm.test \ +pp-xrm_mc.sm.test \ +pp-xrm_nacl.sm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/embedded/Makefile.am =================================================================== - --- tests/prism/prism-examples/embedded/Makefile.am (revision 0) +++ tests/prism/prism-examples/embedded/Makefile.am (revision 0) @@ -0,0 +1,36 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_embedded.sm.test \ +pp-prism_embedded.sm.test \ +parse-pctl_embedded_exptime.csl.test \ +parse-pctl_embedded_prob.csl.test \ +pp-pctl_embedded_exptime.csl.test \ +pp-pctl_embedded_prob.csl.test \ +parse-xpctl_embedded_exptime.csl.test \ +parse-xpctl_embedded_prob.csl.test \ +pp-xpctl_embedded_exptime.csl.test \ +pp-xpctl_embedded_prob.csl.test \ +parse-xrm_embedded.sm.test \ +pp-xrm_embedded.sm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/kanban/Makefile.am =================================================================== - --- tests/prism/prism-examples/kanban/Makefile.am (revision 0) +++ tests/prism/prism-examples/kanban/Makefile.am (revision 0) @@ -0,0 +1,32 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_kanban.sm.test \ +pp-prism_kanban.sm.test \ +parse-pctl_kanban.csl.test \ +pp-pctl_kanban.csl.test \ +parse-xpctl_kanban.csl.test \ +pp-xpctl_kanban.csl.test \ +parse-xrm_kanban.sm.test \ +pp-xrm_kanban.sm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/rabin/Makefile.am =================================================================== - --- tests/prism/prism-examples/rabin/Makefile.am (revision 0) +++ tests/prism/prism-examples/rabin/Makefile.am (revision 0) @@ -0,0 +1,86 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_rabin10.nm.test \ +parse-prism_rabin12.nm.test \ +parse-prism_rabin3.nm.test \ +parse-prism_rabin4.nm.test \ +parse-prism_rabin5.nm.test \ +parse-prism_rabin6.nm.test \ +parse-prism_rabin8.nm.test \ +pp-prism_rabin10.nm.test \ +pp-prism_rabin12.nm.test \ +pp-prism_rabin3.nm.test \ +pp-prism_rabin4.nm.test \ +pp-prism_rabin5.nm.test \ +pp-prism_rabin6.nm.test \ +pp-prism_rabin8.nm.test \ +parse-pctl_rabin10.pctl.test \ +parse-pctl_rabin12.pctl.test \ +parse-pctl_rabin3.pctl.test \ +parse-pctl_rabin4.pctl.test \ +parse-pctl_rabin5.pctl.test \ +parse-pctl_rabin6.pctl.test \ +parse-pctl_rabin8.pctl.test \ +pp-pctl_rabin10.pctl.test \ +pp-pctl_rabin12.pctl.test \ +pp-pctl_rabin3.pctl.test \ +pp-pctl_rabin4.pctl.test \ +pp-pctl_rabin5.pctl.test \ +pp-pctl_rabin6.pctl.test \ +pp-pctl_rabin8.pctl.test \ +parse-xpctl_rabin10.pctl.test \ +parse-xpctl_rabin12.pctl.test \ +parse-xpctl_rabin3.pctl.test \ +parse-xpctl_rabin4.pctl.test \ +parse-xpctl_rabin5.pctl.test \ +parse-xpctl_rabin6.pctl.test \ +parse-xpctl_rabin8.pctl.test \ +pp-xpctl_rabin10.pctl.test \ +pp-xpctl_rabin12.pctl.test \ +pp-xpctl_rabin3.pctl.test \ +pp-xpctl_rabin4.pctl.test \ +pp-xpctl_rabin5.pctl.test \ +pp-xpctl_rabin6.pctl.test \ +pp-xpctl_rabin8.pctl.test \ +parse-xrm_rabin10.nm.test \ +parse-xrm_rabin12.nm.test \ +parse-xrm_rabin3.nm.test \ +parse-xrm_rabin4.nm.test \ +parse-xrm_rabin5.nm.test \ +parse-xrm_rabin6.nm.test \ +parse-xrm_rabin8.nm.test \ +pp-xrm_rabin10.nm.test \ +pp-xrm_rabin12.nm.test \ +pp-xrm_rabin3.nm.test \ +pp-xrm_rabin4.nm.test \ +pp-xrm_rabin5.nm.test \ +pp-xrm_rabin6.nm.test \ +pp-xrm_rabin8.nm.test + +XFAIL_TESTS = \ +parse-prism_rabin8.nm.test \ +pp-prism_rabin8.nm.test \ +parse-xrm_rabin8.nm.test \ +pp-xrm_rabin8.nm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/phil/original/Makefile.am =================================================================== - --- tests/prism/prism-examples/phil/original/Makefile.am (revision 0) +++ tests/prism/prism-examples/phil/original/Makefile.am (revision 0) @@ -0,0 +1,120 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_phil10.nm.test \ +parse-prism_phil15.nm.test \ +parse-prism_phil20.nm.test \ +parse-prism_phil25.nm.test \ +parse-prism_phil30.nm.test \ +parse-prism_phil3.nm.test \ +parse-prism_phil4.nm.test \ +parse-prism_phil5.nm.test \ +parse-prism_phil6.nm.test \ +parse-prism_phil7.nm.test \ +parse-prism_phil8.nm.test \ +parse-prism_phil9.nm.test \ +pp-prism_phil10.nm.test \ +pp-prism_phil15.nm.test \ +pp-prism_phil20.nm.test \ +pp-prism_phil25.nm.test \ +pp-prism_phil30.nm.test \ +pp-prism_phil3.nm.test \ +pp-prism_phil4.nm.test \ +pp-prism_phil5.nm.test \ +pp-prism_phil6.nm.test \ +pp-prism_phil7.nm.test \ +pp-prism_phil8.nm.test \ +pp-prism_phil9.nm.test \ +parse-pctl_phil10.pctl.test \ +parse-pctl_phil15.pctl.test \ +parse-pctl_phil20.pctl.test \ +parse-pctl_phil25.pctl.test \ +parse-pctl_phil30.pctl.test \ +parse-pctl_phil3.pctl.test \ +parse-pctl_phil4.pctl.test \ +parse-pctl_phil5.pctl.test \ +parse-pctl_phil6.pctl.test \ +parse-pctl_phil7.pctl.test \ +parse-pctl_phil8.pctl.test \ +parse-pctl_phil9.pctl.test \ +pp-pctl_phil10.pctl.test \ +pp-pctl_phil15.pctl.test \ +pp-pctl_phil20.pctl.test \ +pp-pctl_phil25.pctl.test \ +pp-pctl_phil30.pctl.test \ +pp-pctl_phil3.pctl.test \ +pp-pctl_phil4.pctl.test \ +pp-pctl_phil5.pctl.test \ +pp-pctl_phil6.pctl.test \ +pp-pctl_phil7.pctl.test \ +pp-pctl_phil8.pctl.test \ +pp-pctl_phil9.pctl.test \ +parse-xpctl_phil10.pctl.test \ +parse-xpctl_phil15.pctl.test \ +parse-xpctl_phil20.pctl.test \ +parse-xpctl_phil25.pctl.test \ +parse-xpctl_phil30.pctl.test \ +parse-xpctl_phil3.pctl.test \ +parse-xpctl_phil4.pctl.test \ +parse-xpctl_phil5.pctl.test \ +parse-xpctl_phil6.pctl.test \ +parse-xpctl_phil7.pctl.test \ +parse-xpctl_phil8.pctl.test \ +parse-xpctl_phil9.pctl.test \ +pp-xpctl_phil10.pctl.test \ +pp-xpctl_phil15.pctl.test \ +pp-xpctl_phil20.pctl.test \ +pp-xpctl_phil25.pctl.test \ +pp-xpctl_phil30.pctl.test \ +pp-xpctl_phil3.pctl.test \ +pp-xpctl_phil4.pctl.test \ +pp-xpctl_phil5.pctl.test \ +pp-xpctl_phil6.pctl.test \ +pp-xpctl_phil7.pctl.test \ +pp-xpctl_phil8.pctl.test \ +pp-xpctl_phil9.pctl.test \ +parse-xrm_phil10.nm.test \ +parse-xrm_phil15.nm.test \ +parse-xrm_phil20.nm.test \ +parse-xrm_phil25.nm.test \ +parse-xrm_phil30.nm.test \ +parse-xrm_phil3.nm.test \ +parse-xrm_phil4.nm.test \ +parse-xrm_phil5.nm.test \ +parse-xrm_phil6.nm.test \ +parse-xrm_phil7.nm.test \ +parse-xrm_phil8.nm.test \ +parse-xrm_phil9.nm.test \ +pp-xrm_phil10.nm.test \ +pp-xrm_phil15.nm.test \ +pp-xrm_phil20.nm.test \ +pp-xrm_phil25.nm.test \ +pp-xrm_phil30.nm.test \ +pp-xrm_phil3.nm.test \ +pp-xrm_phil4.nm.test \ +pp-xrm_phil5.nm.test \ +pp-xrm_phil6.nm.test \ +pp-xrm_phil7.nm.test \ +pp-xrm_phil8.nm.test \ +pp-xrm_phil9.nm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/phil/nofair/Makefile.am =================================================================== - --- tests/prism/prism-examples/phil/nofair/Makefile.am (revision 0) +++ tests/prism/prism-examples/phil/nofair/Makefile.am (revision 0) @@ -0,0 +1,84 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_phil-nofair10.nm.test \ +parse-prism_phil-nofair3.nm.test \ +parse-prism_phil-nofair4.nm.test \ +parse-prism_phil-nofair5.nm.test \ +parse-prism_phil-nofair6.nm.test \ +parse-prism_phil-nofair7.nm.test \ +parse-prism_phil-nofair8.nm.test \ +parse-prism_phil-nofair9.nm.test \ +pp-prism_phil-nofair10.nm.test \ +pp-prism_phil-nofair3.nm.test \ +pp-prism_phil-nofair4.nm.test \ +pp-prism_phil-nofair5.nm.test \ +pp-prism_phil-nofair6.nm.test \ +pp-prism_phil-nofair7.nm.test \ +pp-prism_phil-nofair8.nm.test \ +pp-prism_phil-nofair9.nm.test \ +parse-pctl_phil3.pctl.test \ +parse-pctl_phil4.pctl.test \ +parse-pctl_phil5.pctl.test \ +parse-pctl_phil6.pctl.test \ +parse-pctl_phil7.pctl.test \ +parse-pctl_phil8.pctl.test \ +parse-pctl_phil9.pctl.test \ +pp-pctl_phil3.pctl.test \ +pp-pctl_phil4.pctl.test \ +pp-pctl_phil5.pctl.test \ +pp-pctl_phil6.pctl.test \ +pp-pctl_phil7.pctl.test \ +pp-pctl_phil8.pctl.test \ +pp-pctl_phil9.pctl.test \ +parse-xpctl_phil3.pctl.test \ +parse-xpctl_phil4.pctl.test \ +parse-xpctl_phil5.pctl.test \ +parse-xpctl_phil6.pctl.test \ +parse-xpctl_phil7.pctl.test \ +parse-xpctl_phil8.pctl.test \ +parse-xpctl_phil9.pctl.test \ +pp-xpctl_phil3.pctl.test \ +pp-xpctl_phil4.pctl.test \ +pp-xpctl_phil5.pctl.test \ +pp-xpctl_phil6.pctl.test \ +pp-xpctl_phil7.pctl.test \ +pp-xpctl_phil8.pctl.test \ +pp-xpctl_phil9.pctl.test \ +parse-xrm_phil-nofair10.nm.test \ +parse-xrm_phil-nofair3.nm.test \ +parse-xrm_phil-nofair4.nm.test \ +parse-xrm_phil-nofair5.nm.test \ +parse-xrm_phil-nofair6.nm.test \ +parse-xrm_phil-nofair7.nm.test \ +parse-xrm_phil-nofair8.nm.test \ +parse-xrm_phil-nofair9.nm.test \ +pp-xrm_phil-nofair10.nm.test \ +pp-xrm_phil-nofair3.nm.test \ +pp-xrm_phil-nofair4.nm.test \ +pp-xrm_phil-nofair5.nm.test \ +pp-xrm_phil-nofair6.nm.test \ +pp-xrm_phil-nofair7.nm.test \ +pp-xrm_phil-nofair8.nm.test \ +pp-xrm_phil-nofair9.nm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/leader/synchronous/Makefile.am =================================================================== - --- tests/prism/prism-examples/leader/synchronous/Makefile.am (revision 0) +++ tests/prism/prism-examples/leader/synchronous/Makefile.am (revision 0) @@ -0,0 +1,220 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_leader10_2.pm.test \ +parse-prism_leader3_10.pm.test \ +parse-prism_leader3_12.pm.test \ +parse-prism_leader3_14.pm.test \ +parse-prism_leader3_16.pm.test \ +parse-prism_leader3_2.pm.test \ +parse-prism_leader3_3.pm.test \ +parse-prism_leader3_4.pm.test \ +parse-prism_leader3_5.pm.test \ +parse-prism_leader3_6.pm.test \ +parse-prism_leader3_8.pm.test \ +parse-prism_leader4_10.pm.test \ +parse-prism_leader4_12.pm.test \ +parse-prism_leader4_2.pm.test \ +parse-prism_leader4_3.pm.test \ +parse-prism_leader4_4.pm.test \ +parse-prism_leader4_5.pm.test \ +parse-prism_leader4_6.pm.test \ +parse-prism_leader4_8.pm.test \ +parse-prism_leader5_2.pm.test \ +parse-prism_leader5_3.pm.test \ +parse-prism_leader5_4.pm.test \ +parse-prism_leader5_5.pm.test \ +parse-prism_leader5_6.pm.test \ +parse-prism_leader5_8.pm.test \ +parse-prism_leader6_2.pm.test \ +parse-prism_leader6_3.pm.test \ +parse-prism_leader6_4.pm.test \ +parse-prism_leader6_5.pm.test \ +parse-prism_leader6_6.pm.test \ +parse-prism_leader7_2.pm.test \ +parse-prism_leader7_3.pm.test \ +parse-prism_leader7_4.pm.test \ +parse-prism_leader7_5.pm.test \ +parse-prism_leader8_2.pm.test \ +parse-prism_leader8_3.pm.test \ +parse-prism_leader8_4.pm.test \ +parse-prism_leader8_6.pm.test \ +parse-prism_leader9_2.pm.test \ +parse-prism_leader9_3.pm.test \ +parse-prism_leader9_4.pm.test \ +pp-prism_leader10_2.pm.test \ +pp-prism_leader3_10.pm.test \ +pp-prism_leader3_12.pm.test \ +pp-prism_leader3_14.pm.test \ +pp-prism_leader3_16.pm.test \ +pp-prism_leader3_2.pm.test \ +pp-prism_leader3_3.pm.test \ +pp-prism_leader3_4.pm.test \ +pp-prism_leader3_5.pm.test \ +pp-prism_leader3_6.pm.test \ +pp-prism_leader3_8.pm.test \ +pp-prism_leader4_10.pm.test \ +pp-prism_leader4_12.pm.test \ +pp-prism_leader4_2.pm.test \ +pp-prism_leader4_3.pm.test \ +pp-prism_leader4_4.pm.test \ +pp-prism_leader4_5.pm.test \ +pp-prism_leader4_6.pm.test \ +pp-prism_leader4_8.pm.test \ +pp-prism_leader5_2.pm.test \ +pp-prism_leader5_3.pm.test \ +pp-prism_leader5_4.pm.test \ +pp-prism_leader5_5.pm.test \ +pp-prism_leader5_6.pm.test \ +pp-prism_leader5_8.pm.test \ +pp-prism_leader6_2.pm.test \ +pp-prism_leader6_3.pm.test \ +pp-prism_leader6_4.pm.test \ +pp-prism_leader6_5.pm.test \ +pp-prism_leader6_6.pm.test \ +pp-prism_leader7_2.pm.test \ +pp-prism_leader7_3.pm.test \ +pp-prism_leader7_4.pm.test \ +pp-prism_leader7_5.pm.test \ +pp-prism_leader8_2.pm.test \ +pp-prism_leader8_3.pm.test \ +pp-prism_leader8_4.pm.test \ +pp-prism_leader8_6.pm.test \ +pp-prism_leader9_2.pm.test \ +pp-prism_leader9_3.pm.test \ +pp-prism_leader9_4.pm.test \ +parse-pctl_leader10.pctl.test \ +parse-pctl_leader3.pctl.test \ +parse-pctl_leader4.pctl.test \ +parse-pctl_leader5.pctl.test \ +parse-pctl_leader6.pctl.test \ +parse-pctl_leader7.pctl.test \ +parse-pctl_leader8.pctl.test \ +parse-pctl_leader9.pctl.test \ +pp-pctl_leader10.pctl.test \ +pp-pctl_leader3.pctl.test \ +pp-pctl_leader4.pctl.test \ +pp-pctl_leader5.pctl.test \ +pp-pctl_leader6.pctl.test \ +pp-pctl_leader7.pctl.test \ +pp-pctl_leader8.pctl.test \ +pp-pctl_leader9.pctl.test \ +parse-xpctl_leader10.pctl.test \ +parse-xpctl_leader3.pctl.test \ +parse-xpctl_leader4.pctl.test \ +parse-xpctl_leader5.pctl.test \ +parse-xpctl_leader6.pctl.test \ +parse-xpctl_leader7.pctl.test \ +parse-xpctl_leader8.pctl.test \ +parse-xpctl_leader9.pctl.test \ +pp-xpctl_leader10.pctl.test \ +pp-xpctl_leader3.pctl.test \ +pp-xpctl_leader4.pctl.test \ +pp-xpctl_leader5.pctl.test \ +pp-xpctl_leader6.pctl.test \ +pp-xpctl_leader7.pctl.test \ +pp-xpctl_leader8.pctl.test \ +pp-xpctl_leader9.pctl.test \ +parse-xrm_leader10_2.pm.test \ +parse-xrm_leader3_10.pm.test \ +parse-xrm_leader3_12.pm.test \ +parse-xrm_leader3_14.pm.test \ +parse-xrm_leader3_16.pm.test \ +parse-xrm_leader3_2.pm.test \ +parse-xrm_leader3_3.pm.test \ +parse-xrm_leader3_4.pm.test \ +parse-xrm_leader3_5.pm.test \ +parse-xrm_leader3_6.pm.test \ +parse-xrm_leader3_8.pm.test \ +parse-xrm_leader4_10.pm.test \ +parse-xrm_leader4_12.pm.test \ +parse-xrm_leader4_2.pm.test \ +parse-xrm_leader4_3.pm.test \ +parse-xrm_leader4_4.pm.test \ +parse-xrm_leader4_5.pm.test \ +parse-xrm_leader4_6.pm.test \ +parse-xrm_leader4_8.pm.test \ +parse-xrm_leader5_2.pm.test \ +parse-xrm_leader5_3.pm.test \ +parse-xrm_leader5_4.pm.test \ +parse-xrm_leader5_5.pm.test \ +parse-xrm_leader5_6.pm.test \ +parse-xrm_leader5_8.pm.test \ +parse-xrm_leader6_2.pm.test \ +parse-xrm_leader6_3.pm.test \ +parse-xrm_leader6_4.pm.test \ +parse-xrm_leader6_5.pm.test \ +parse-xrm_leader6_6.pm.test \ +parse-xrm_leader7_2.pm.test \ +parse-xrm_leader7_3.pm.test \ +parse-xrm_leader7_4.pm.test \ +parse-xrm_leader7_5.pm.test \ +parse-xrm_leader8_2.pm.test \ +parse-xrm_leader8_3.pm.test \ +parse-xrm_leader8_4.pm.test \ +parse-xrm_leader8_6.pm.test \ +parse-xrm_leader9_2.pm.test \ +parse-xrm_leader9_3.pm.test \ +parse-xrm_leader9_4.pm.test \ +pp-xrm_leader10_2.pm.test \ +pp-xrm_leader3_10.pm.test \ +pp-xrm_leader3_12.pm.test \ +pp-xrm_leader3_14.pm.test \ +pp-xrm_leader3_16.pm.test \ +pp-xrm_leader3_2.pm.test \ +pp-xrm_leader3_3.pm.test \ +pp-xrm_leader3_4.pm.test \ +pp-xrm_leader3_5.pm.test \ +pp-xrm_leader3_6.pm.test \ +pp-xrm_leader3_8.pm.test \ +pp-xrm_leader4_10.pm.test \ +pp-xrm_leader4_12.pm.test \ +pp-xrm_leader4_2.pm.test \ +pp-xrm_leader4_3.pm.test \ +pp-xrm_leader4_4.pm.test \ +pp-xrm_leader4_5.pm.test \ +pp-xrm_leader4_6.pm.test \ +pp-xrm_leader4_8.pm.test \ +pp-xrm_leader5_2.pm.test \ +pp-xrm_leader5_3.pm.test \ +pp-xrm_leader5_4.pm.test \ +pp-xrm_leader5_5.pm.test \ +pp-xrm_leader5_6.pm.test \ +pp-xrm_leader5_8.pm.test \ +pp-xrm_leader6_2.pm.test \ +pp-xrm_leader6_3.pm.test \ +pp-xrm_leader6_4.pm.test \ +pp-xrm_leader6_5.pm.test \ +pp-xrm_leader6_6.pm.test \ +pp-xrm_leader7_2.pm.test \ +pp-xrm_leader7_3.pm.test \ +pp-xrm_leader7_4.pm.test \ +pp-xrm_leader7_5.pm.test \ +pp-xrm_leader8_2.pm.test \ +pp-xrm_leader8_3.pm.test \ +pp-xrm_leader8_4.pm.test \ +pp-xrm_leader8_6.pm.test \ +pp-xrm_leader9_2.pm.test \ +pp-xrm_leader9_3.pm.test \ +pp-xrm_leader9_4.pm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/leader/asynchronous/Makefile.am =================================================================== - --- tests/prism/prism-examples/leader/asynchronous/Makefile.am (revision 0) +++ tests/prism/prism-examples/leader/asynchronous/Makefile.am (revision 0) @@ -0,0 +1,122 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_leader10.nm.test \ +parse-prism_leader3.nm.test \ +parse-prism_leader4.nm.test \ +parse-prism_leader5.nm.test \ +parse-prism_leader6.nm.test \ +parse-prism_leader7.nm.test \ +parse-prism_leader8.nm.test \ +parse-prism_leader9.nm.test \ +pp-prism_leader10.nm.test \ +pp-prism_leader3.nm.test \ +pp-prism_leader4.nm.test \ +pp-prism_leader5.nm.test \ +pp-prism_leader6.nm.test \ +pp-prism_leader7.nm.test \ +pp-prism_leader8.nm.test \ +pp-prism_leader9.nm.test \ +parse-pctl_leader10.pctl.test \ +parse-pctl_leader3.pctl.test \ +parse-pctl_leader4.pctl.test \ +parse-pctl_leader5.pctl.test \ +parse-pctl_leader6.pctl.test \ +parse-pctl_leader7.pctl.test \ +parse-pctl_leader8.pctl.test \ +parse-pctl_leader9.pctl.test \ +pp-pctl_leader10.pctl.test \ +pp-pctl_leader3.pctl.test \ +pp-pctl_leader4.pctl.test \ +pp-pctl_leader5.pctl.test \ +pp-pctl_leader6.pctl.test \ +pp-pctl_leader7.pctl.test \ +pp-pctl_leader8.pctl.test \ +pp-pctl_leader9.pctl.test \ +parse-xpctl_leader10.pctl.test \ +parse-xpctl_leader3.pctl.test \ +parse-xpctl_leader4.pctl.test \ +parse-xpctl_leader5.pctl.test \ +parse-xpctl_leader6.pctl.test \ +parse-xpctl_leader7.pctl.test \ +parse-xpctl_leader8.pctl.test \ +parse-xpctl_leader9.pctl.test \ +pp-xpctl_leader10.pctl.test \ +pp-xpctl_leader3.pctl.test \ +pp-xpctl_leader4.pctl.test \ +pp-xpctl_leader5.pctl.test \ +pp-xpctl_leader6.pctl.test \ +pp-xpctl_leader7.pctl.test \ +pp-xpctl_leader8.pctl.test \ +pp-xpctl_leader9.pctl.test \ +parse-xrm_leader10.nm.test \ +parse-xrm_leader3.nm.test \ +parse-xrm_leader4.nm.test \ +parse-xrm_leader5.nm.test \ +parse-xrm_leader6.nm.test \ +parse-xrm_leader7.nm.test \ +parse-xrm_leader8.nm.test \ +parse-xrm_leader9.nm.test \ +pp-xrm_leader10.nm.test \ +pp-xrm_leader3.nm.test \ +pp-xrm_leader4.nm.test \ +pp-xrm_leader5.nm.test \ +pp-xrm_leader6.nm.test \ +pp-xrm_leader7.nm.test \ +pp-xrm_leader8.nm.test \ +pp-xrm_leader9.nm.test + +XFAIL_TESTS = \ +parse-pctl_leader10.pctl.test \ +parse-pctl_leader3.pctl.test \ +parse-pctl_leader4.pctl.test \ +parse-pctl_leader5.pctl.test \ +parse-pctl_leader6.pctl.test \ +parse-pctl_leader7.pctl.test \ +parse-pctl_leader8.pctl.test \ +parse-pctl_leader9.pctl.test \ +pp-pctl_leader10.pctl.test \ +pp-pctl_leader3.pctl.test \ +pp-pctl_leader4.pctl.test \ +pp-pctl_leader5.pctl.test \ +pp-pctl_leader6.pctl.test \ +pp-pctl_leader7.pctl.test \ +pp-pctl_leader8.pctl.test \ +pp-pctl_leader9.pctl.test \ +parse-xpctl_leader10.pctl.test \ +parse-xpctl_leader3.pctl.test \ +parse-xpctl_leader4.pctl.test \ +parse-xpctl_leader5.pctl.test \ +parse-xpctl_leader6.pctl.test \ +parse-xpctl_leader7.pctl.test \ +parse-xpctl_leader8.pctl.test \ +parse-xpctl_leader9.pctl.test \ +pp-xpctl_leader10.pctl.test \ +pp-xpctl_leader3.pctl.test \ +pp-xpctl_leader4.pctl.test \ +pp-xpctl_leader5.pctl.test \ +pp-xpctl_leader6.pctl.test \ +pp-xpctl_leader7.pctl.test \ +pp-xpctl_leader8.pctl.test \ +pp-xpctl_leader9.pctl.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/self-stabilisation/israeli-jalfon/Makefile.am =================================================================== - --- tests/prism/prism-examples/self-stabilisation/israeli-jalfon/Makefile.am (revision 0) +++ tests/prism/prism-examples/self-stabilisation/israeli-jalfon/Makefile.am (revision 0) @@ -0,0 +1,176 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_ij10.nm.test \ +parse-prism_ij11.nm.test \ +parse-prism_ij12.nm.test \ +parse-prism_ij13.nm.test \ +parse-prism_ij14.nm.test \ +parse-prism_ij15.nm.test \ +parse-prism_ij16.nm.test \ +parse-prism_ij17.nm.test \ +parse-prism_ij18.nm.test \ +parse-prism_ij19.nm.test \ +parse-prism_ij20.nm.test \ +parse-prism_ij21.nm.test \ +parse-prism_ij3.nm.test \ +parse-prism_ij4.nm.test \ +parse-prism_ij5.nm.test \ +parse-prism_ij6.nm.test \ +parse-prism_ij7.nm.test \ +parse-prism_ij8.nm.test \ +parse-prism_ij9.nm.test \ +pp-prism_ij10.nm.test \ +pp-prism_ij11.nm.test \ +pp-prism_ij12.nm.test \ +pp-prism_ij13.nm.test \ +pp-prism_ij14.nm.test \ +pp-prism_ij15.nm.test \ +pp-prism_ij16.nm.test \ +pp-prism_ij17.nm.test \ +pp-prism_ij18.nm.test \ +pp-prism_ij19.nm.test \ +pp-prism_ij20.nm.test \ +pp-prism_ij21.nm.test \ +pp-prism_ij3.nm.test \ +pp-prism_ij4.nm.test \ +pp-prism_ij5.nm.test \ +pp-prism_ij6.nm.test \ +pp-prism_ij7.nm.test \ +pp-prism_ij8.nm.test \ +pp-prism_ij9.nm.test \ +parse-pctl_ij10.pctl.test \ +parse-pctl_ij11.pctl.test \ +parse-pctl_ij12.pctl.test \ +parse-pctl_ij13.pctl.test \ +parse-pctl_ij14.pctl.test \ +parse-pctl_ij15.pctl.test \ +parse-pctl_ij16.pctl.test \ +parse-pctl_ij17.pctl.test \ +parse-pctl_ij18.pctl.test \ +parse-pctl_ij19.pctl.test \ +parse-pctl_ij20.pctl.test \ +parse-pctl_ij21.pctl.test \ +parse-pctl_ij3.pctl.test \ +parse-pctl_ij4.pctl.test \ +parse-pctl_ij5.pctl.test \ +parse-pctl_ij6.pctl.test \ +parse-pctl_ij7.pctl.test \ +parse-pctl_ij8.pctl.test \ +parse-pctl_ij9.pctl.test \ +pp-pctl_ij10.pctl.test \ +pp-pctl_ij11.pctl.test \ +pp-pctl_ij12.pctl.test \ +pp-pctl_ij13.pctl.test \ +pp-pctl_ij14.pctl.test \ +pp-pctl_ij15.pctl.test \ +pp-pctl_ij16.pctl.test \ +pp-pctl_ij17.pctl.test \ +pp-pctl_ij18.pctl.test \ +pp-pctl_ij19.pctl.test \ +pp-pctl_ij20.pctl.test \ +pp-pctl_ij21.pctl.test \ +pp-pctl_ij3.pctl.test \ +pp-pctl_ij4.pctl.test \ +pp-pctl_ij5.pctl.test \ +pp-pctl_ij6.pctl.test \ +pp-pctl_ij7.pctl.test \ +pp-pctl_ij8.pctl.test \ +pp-pctl_ij9.pctl.test \ +parse-xpctl_ij10.pctl.test \ +parse-xpctl_ij11.pctl.test \ +parse-xpctl_ij12.pctl.test \ +parse-xpctl_ij13.pctl.test \ +parse-xpctl_ij14.pctl.test \ +parse-xpctl_ij15.pctl.test \ +parse-xpctl_ij16.pctl.test \ +parse-xpctl_ij17.pctl.test \ +parse-xpctl_ij18.pctl.test \ +parse-xpctl_ij19.pctl.test \ +parse-xpctl_ij20.pctl.test \ +parse-xpctl_ij21.pctl.test \ +parse-xpctl_ij3.pctl.test \ +parse-xpctl_ij4.pctl.test \ +parse-xpctl_ij5.pctl.test \ +parse-xpctl_ij6.pctl.test \ +parse-xpctl_ij7.pctl.test \ +parse-xpctl_ij8.pctl.test \ +parse-xpctl_ij9.pctl.test \ +pp-xpctl_ij10.pctl.test \ +pp-xpctl_ij11.pctl.test \ +pp-xpctl_ij12.pctl.test \ +pp-xpctl_ij13.pctl.test \ +pp-xpctl_ij14.pctl.test \ +pp-xpctl_ij15.pctl.test \ +pp-xpctl_ij16.pctl.test \ +pp-xpctl_ij17.pctl.test \ +pp-xpctl_ij18.pctl.test \ +pp-xpctl_ij19.pctl.test \ +pp-xpctl_ij20.pctl.test \ +pp-xpctl_ij21.pctl.test \ +pp-xpctl_ij3.pctl.test \ +pp-xpctl_ij4.pctl.test \ +pp-xpctl_ij5.pctl.test \ +pp-xpctl_ij6.pctl.test \ +pp-xpctl_ij7.pctl.test \ +pp-xpctl_ij8.pctl.test \ +pp-xpctl_ij9.pctl.test \ +parse-xrm_ij10.nm.test \ +parse-xrm_ij11.nm.test \ +parse-xrm_ij12.nm.test \ +parse-xrm_ij13.nm.test \ +parse-xrm_ij14.nm.test \ +parse-xrm_ij15.nm.test \ +parse-xrm_ij16.nm.test \ +parse-xrm_ij17.nm.test \ +parse-xrm_ij18.nm.test \ +parse-xrm_ij19.nm.test \ +parse-xrm_ij20.nm.test \ +parse-xrm_ij21.nm.test \ +parse-xrm_ij3.nm.test \ +parse-xrm_ij4.nm.test \ +parse-xrm_ij5.nm.test \ +parse-xrm_ij6.nm.test \ +parse-xrm_ij7.nm.test \ +parse-xrm_ij8.nm.test \ +parse-xrm_ij9.nm.test \ +pp-xrm_ij10.nm.test \ +pp-xrm_ij11.nm.test \ +pp-xrm_ij12.nm.test \ +pp-xrm_ij13.nm.test \ +pp-xrm_ij14.nm.test \ +pp-xrm_ij15.nm.test \ +pp-xrm_ij16.nm.test \ +pp-xrm_ij17.nm.test \ +pp-xrm_ij18.nm.test \ +pp-xrm_ij19.nm.test \ +pp-xrm_ij20.nm.test \ +pp-xrm_ij21.nm.test \ +pp-xrm_ij3.nm.test \ +pp-xrm_ij4.nm.test \ +pp-xrm_ij5.nm.test \ +pp-xrm_ij6.nm.test \ +pp-xrm_ij7.nm.test \ +pp-xrm_ij8.nm.test \ +pp-xrm_ij9.nm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/self-stabilisation/beauquier/Makefile.am =================================================================== - --- tests/prism/prism-examples/self-stabilisation/beauquier/Makefile.am (revision 0) +++ tests/prism/prism-examples/self-stabilisation/beauquier/Makefile.am (revision 0) @@ -0,0 +1,76 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_beauquier11.nm.test \ +parse-prism_beauquier3.nm.test \ +parse-prism_beauquier5.nm.test \ +parse-prism_beauquier7.nm.test \ +parse-prism_beauquier9.nm.test \ +pp-prism_beauquier11.nm.test \ +pp-prism_beauquier3.nm.test \ +pp-prism_beauquier5.nm.test \ +pp-prism_beauquier7.nm.test \ +pp-prism_beauquier9.nm.test \ +parse-pctl_beauquier11.pctl.test \ +parse-pctl_beauquier3.pctl.test \ +parse-pctl_beauquier5.pctl.test \ +parse-pctl_beauquier7.pctl.test \ +parse-pctl_beauquier9.pctl.test \ +pp-pctl_beauquier11.pctl.test \ +pp-pctl_beauquier3.pctl.test \ +pp-pctl_beauquier5.pctl.test \ +pp-pctl_beauquier7.pctl.test \ +pp-pctl_beauquier9.pctl.test \ +parse-xpctl_beauquier11.pctl.test \ +parse-xpctl_beauquier3.pctl.test \ +parse-xpctl_beauquier5.pctl.test \ +parse-xpctl_beauquier7.pctl.test \ +parse-xpctl_beauquier9.pctl.test \ +pp-xpctl_beauquier11.pctl.test \ +pp-xpctl_beauquier3.pctl.test \ +pp-xpctl_beauquier5.pctl.test \ +pp-xpctl_beauquier7.pctl.test \ +pp-xpctl_beauquier9.pctl.test \ +parse-xrm_beauquier11.nm.test \ +parse-xrm_beauquier3.nm.test \ +parse-xrm_beauquier5.nm.test \ +parse-xrm_beauquier7.nm.test \ +parse-xrm_beauquier9.nm.test \ +pp-xrm_beauquier11.nm.test \ +pp-xrm_beauquier3.nm.test \ +pp-xrm_beauquier5.nm.test \ +pp-xrm_beauquier7.nm.test \ +pp-xrm_beauquier9.nm.test + +XFAIL_TESTS = \ +parse-xpctl_beauquier11.pctl.test \ +parse-xpctl_beauquier3.pctl.test \ +parse-xpctl_beauquier5.pctl.test \ +parse-xpctl_beauquier7.pctl.test \ +parse-xpctl_beauquier9.pctl.test \ +pp-xpctl_beauquier11.pctl.test \ +pp-xpctl_beauquier3.pctl.test \ +pp-xpctl_beauquier5.pctl.test \ +pp-xpctl_beauquier7.pctl.test \ +pp-xpctl_beauquier9.pctl.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/self-stabilisation/herman/Makefile.am =================================================================== - --- tests/prism/prism-examples/self-stabilisation/herman/Makefile.am (revision 0) +++ tests/prism/prism-examples/self-stabilisation/herman/Makefile.am (revision 0) @@ -0,0 +1,126 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_herman11.pm.test \ +parse-prism_herman13.pm.test \ +parse-prism_herman15.pm.test \ +parse-prism_herman17.pm.test \ +parse-prism_herman19.pm.test \ +parse-prism_herman21.pm.test \ +parse-prism_herman3.pm.test \ +parse-prism_herman5.pm.test \ +parse-prism_herman7.pm.test \ +parse-prism_herman9.pm.test \ +pp-prism_herman11.pm.test \ +pp-prism_herman13.pm.test \ +pp-prism_herman15.pm.test \ +pp-prism_herman17.pm.test \ +pp-prism_herman19.pm.test \ +pp-prism_herman21.pm.test \ +pp-prism_herman3.pm.test \ +pp-prism_herman5.pm.test \ +pp-prism_herman7.pm.test \ +pp-prism_herman9.pm.test \ +parse-pctl_herman11.pctl.test \ +parse-pctl_herman13.pctl.test \ +parse-pctl_herman15.pctl.test \ +parse-pctl_herman17.pctl.test \ +parse-pctl_herman19.pctl.test \ +parse-pctl_herman21.pctl.test \ +parse-pctl_herman3.pctl.test \ +parse-pctl_herman5.pctl.test \ +parse-pctl_herman7.pctl.test \ +parse-pctl_herman9.pctl.test \ +pp-pctl_herman11.pctl.test \ +pp-pctl_herman13.pctl.test \ +pp-pctl_herman15.pctl.test \ +pp-pctl_herman17.pctl.test \ +pp-pctl_herman19.pctl.test \ +pp-pctl_herman21.pctl.test \ +pp-pctl_herman3.pctl.test \ +pp-pctl_herman5.pctl.test \ +pp-pctl_herman7.pctl.test \ +pp-pctl_herman9.pctl.test \ +parse-xpctl_herman11.pctl.test \ +parse-xpctl_herman13.pctl.test \ +parse-xpctl_herman15.pctl.test \ +parse-xpctl_herman17.pctl.test \ +parse-xpctl_herman19.pctl.test \ +parse-xpctl_herman21.pctl.test \ +parse-xpctl_herman3.pctl.test \ +parse-xpctl_herman5.pctl.test \ +parse-xpctl_herman7.pctl.test \ +parse-xpctl_herman9.pctl.test \ +pp-xpctl_herman11.pctl.test \ +pp-xpctl_herman13.pctl.test \ +pp-xpctl_herman15.pctl.test \ +pp-xpctl_herman17.pctl.test \ +pp-xpctl_herman19.pctl.test \ +pp-xpctl_herman21.pctl.test \ +pp-xpctl_herman3.pctl.test \ +pp-xpctl_herman5.pctl.test \ +pp-xpctl_herman7.pctl.test \ +pp-xpctl_herman9.pctl.test \ +parse-xrm_herman11.pm.test \ +parse-xrm_herman13.pm.test \ +parse-xrm_herman15.pm.test \ +parse-xrm_herman17.pm.test \ +parse-xrm_herman19.pm.test \ +parse-xrm_herman21.pm.test \ +parse-xrm_herman3.pm.test \ +parse-xrm_herman5.pm.test \ +parse-xrm_herman7.pm.test \ +parse-xrm_herman9.pm.test \ +pp-xrm_herman11.pm.test \ +pp-xrm_herman13.pm.test \ +pp-xrm_herman15.pm.test \ +pp-xrm_herman17.pm.test \ +pp-xrm_herman19.pm.test \ +pp-xrm_herman21.pm.test \ +pp-xrm_herman3.pm.test \ +pp-xrm_herman5.pm.test \ +pp-xrm_herman7.pm.test \ +pp-xrm_herman9.pm.test + +XFAIL_TESTS = \ +parse-xpctl_herman11.pctl.test \ +parse-xpctl_herman13.pctl.test \ +parse-xpctl_herman15.pctl.test \ +parse-xpctl_herman17.pctl.test \ +parse-xpctl_herman19.pctl.test \ +parse-xpctl_herman21.pctl.test \ +parse-xpctl_herman3.pctl.test \ +parse-xpctl_herman5.pctl.test \ +parse-xpctl_herman7.pctl.test \ +parse-xpctl_herman9.pctl.test \ +pp-xpctl_herman11.pctl.test \ +pp-xpctl_herman13.pctl.test \ +pp-xpctl_herman15.pctl.test \ +pp-xpctl_herman17.pctl.test \ +pp-xpctl_herman19.pctl.test \ +pp-xpctl_herman21.pctl.test \ +pp-xpctl_herman3.pctl.test \ +pp-xpctl_herman5.pctl.test \ +pp-xpctl_herman7.pctl.test \ +pp-xpctl_herman9.pctl.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/polling/Makefile.am =================================================================== - --- tests/prism/prism-examples/polling/Makefile.am (revision 0) +++ tests/prism/prism-examples/polling/Makefile.am (revision 0) @@ -0,0 +1,104 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_poll10.sm.test \ +parse-prism_poll11.sm.test \ +parse-prism_poll12.sm.test \ +parse-prism_poll13.sm.test \ +parse-prism_poll14.sm.test \ +parse-prism_poll15.sm.test \ +parse-prism_poll16.sm.test \ +parse-prism_poll17.sm.test \ +parse-prism_poll18.sm.test \ +parse-prism_poll19.sm.test \ +parse-prism_poll20.sm.test \ +parse-prism_poll2.sm.test \ +parse-prism_poll3.sm.test \ +parse-prism_poll4.sm.test \ +parse-prism_poll5.sm.test \ +parse-prism_poll6.sm.test \ +parse-prism_poll7.sm.test \ +parse-prism_poll8.sm.test \ +parse-prism_poll9.sm.test \ +pp-prism_poll10.sm.test \ +pp-prism_poll11.sm.test \ +pp-prism_poll12.sm.test \ +pp-prism_poll13.sm.test \ +pp-prism_poll14.sm.test \ +pp-prism_poll15.sm.test \ +pp-prism_poll16.sm.test \ +pp-prism_poll17.sm.test \ +pp-prism_poll18.sm.test \ +pp-prism_poll19.sm.test \ +pp-prism_poll20.sm.test \ +pp-prism_poll2.sm.test \ +pp-prism_poll3.sm.test \ +pp-prism_poll4.sm.test \ +pp-prism_poll5.sm.test \ +pp-prism_poll6.sm.test \ +pp-prism_poll7.sm.test \ +pp-prism_poll8.sm.test \ +pp-prism_poll9.sm.test \ +parse-pctl_poll.csl.test \ +pp-pctl_poll.csl.test \ +parse-xpctl_poll.csl.test \ +pp-xpctl_poll.csl.test \ +parse-xrm_poll10.sm.test \ +parse-xrm_poll11.sm.test \ +parse-xrm_poll12.sm.test \ +parse-xrm_poll13.sm.test \ +parse-xrm_poll14.sm.test \ +parse-xrm_poll15.sm.test \ +parse-xrm_poll16.sm.test \ +parse-xrm_poll17.sm.test \ +parse-xrm_poll18.sm.test \ +parse-xrm_poll19.sm.test \ +parse-xrm_poll20.sm.test \ +parse-xrm_poll2.sm.test \ +parse-xrm_poll3.sm.test \ +parse-xrm_poll4.sm.test \ +parse-xrm_poll5.sm.test \ +parse-xrm_poll6.sm.test \ +parse-xrm_poll7.sm.test \ +parse-xrm_poll8.sm.test \ +parse-xrm_poll9.sm.test \ +pp-xrm_poll10.sm.test \ +pp-xrm_poll11.sm.test \ +pp-xrm_poll12.sm.test \ +pp-xrm_poll13.sm.test \ +pp-xrm_poll14.sm.test \ +pp-xrm_poll15.sm.test \ +pp-xrm_poll16.sm.test \ +pp-xrm_poll17.sm.test \ +pp-xrm_poll18.sm.test \ +pp-xrm_poll19.sm.test \ +pp-xrm_poll20.sm.test \ +pp-xrm_poll2.sm.test \ +pp-xrm_poll3.sm.test \ +pp-xrm_poll4.sm.test \ +pp-xrm_poll5.sm.test \ +pp-xrm_poll6.sm.test \ +pp-xrm_poll7.sm.test \ +pp-xrm_poll8.sm.test \ +pp-xrm_poll9.sm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/dice/Makefile.am =================================================================== - --- tests/prism/prism-examples/dice/Makefile.am (revision 0) +++ tests/prism/prism-examples/dice/Makefile.am (revision 0) @@ -0,0 +1,48 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_dice.pm.test \ +parse-prism_two_dice_knuth.pm.test \ +parse-prism_two_dice.nm.test \ +pp-prism_dice.pm.test \ +pp-prism_two_dice_knuth.pm.test \ +pp-prism_two_dice.nm.test \ +parse-pctl_dice.pctl.test \ +parse-pctl_two_dice_knuth.pctl.test \ +parse-pctl_two_dice.pctl.test \ +pp-pctl_dice.pctl.test \ +pp-pctl_two_dice_knuth.pctl.test \ +pp-pctl_two_dice.pctl.test \ +parse-xpctl_dice.pctl.test \ +parse-xpctl_two_dice_knuth.pctl.test \ +parse-xpctl_two_dice.pctl.test \ +pp-xpctl_dice.pctl.test \ +pp-xpctl_two_dice_knuth.pctl.test \ +pp-xpctl_two_dice.pctl.test \ +parse-xrm_dice.pm.test \ +parse-xrm_two_dice_knuth.pm.test \ +parse-xrm_two_dice.nm.test \ +pp-xrm_dice.pm.test \ +pp-xrm_two_dice_knuth.pm.test \ +pp-xrm_two_dice.nm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/mutual/Makefile.am =================================================================== - --- tests/prism/prism-examples/mutual/Makefile.am (revision 0) +++ tests/prism/prism-examples/mutual/Makefile.am (revision 0) @@ -0,0 +1,64 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_mutual10.nm.test \ +parse-prism_mutual3.nm.test \ +parse-prism_mutual4.nm.test \ +parse-prism_mutual5.nm.test \ +parse-prism_mutual8.nm.test \ +pp-prism_mutual10.nm.test \ +pp-prism_mutual3.nm.test \ +pp-prism_mutual4.nm.test \ +pp-prism_mutual5.nm.test \ +pp-prism_mutual8.nm.test \ +parse-pctl_mutual10.pctl.test \ +parse-pctl_mutual3.pctl.test \ +parse-pctl_mutual4.pctl.test \ +parse-pctl_mutual5.pctl.test \ +parse-pctl_mutual8.pctl.test \ +pp-pctl_mutual10.pctl.test \ +pp-pctl_mutual3.pctl.test \ +pp-pctl_mutual4.pctl.test \ +pp-pctl_mutual5.pctl.test \ +pp-pctl_mutual8.pctl.test \ +parse-xpctl_mutual10.pctl.test \ +parse-xpctl_mutual3.pctl.test \ +parse-xpctl_mutual4.pctl.test \ +parse-xpctl_mutual5.pctl.test \ +parse-xpctl_mutual8.pctl.test \ +pp-xpctl_mutual10.pctl.test \ +pp-xpctl_mutual3.pctl.test \ +pp-xpctl_mutual4.pctl.test \ +pp-xpctl_mutual5.pctl.test \ +pp-xpctl_mutual8.pctl.test \ +parse-xrm_mutual10.nm.test \ +parse-xrm_mutual3.nm.test \ +parse-xrm_mutual4.nm.test \ +parse-xrm_mutual5.nm.test \ +parse-xrm_mutual8.nm.test \ +pp-xrm_mutual10.nm.test \ +pp-xrm_mutual3.nm.test \ +pp-xrm_mutual4.nm.test \ +pp-xrm_mutual5.nm.test \ +pp-xrm_mutual8.nm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/tandem/Makefile.am =================================================================== - --- tests/prism/prism-examples/tandem/Makefile.am (revision 0) +++ tests/prism/prism-examples/tandem/Makefile.am (revision 0) @@ -0,0 +1,32 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_tandem.sm.test \ +pp-prism_tandem.sm.test \ +parse-pctl_tandem.csl.test \ +pp-pctl_tandem.csl.test \ +parse-xpctl_tandem.csl.test \ +pp-xpctl_tandem.csl.test \ +parse-xrm_tandem.sm.test \ +pp-xrm_tandem.sm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/Makefile.am =================================================================== - --- tests/prism/prism-examples/Makefile.am (revision 0) +++ tests/prism/prism-examples/Makefile.am (revision 0) @@ -0,0 +1,45 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +EXTRA_DIST = auto README firewire/README + +SUBDIRS = \ +brp \ +cell \ +cluster \ +dice \ +embedded \ +firewire/abst \ +firewire/impl \ +fms \ +kanban \ +leader/synchronous \ +leader/asynchronous \ +molecules \ +mutual \ +pepa \ +phil/nofair \ +phil/original \ +phil_lss \ +polling \ +rabin \ +self-stabilisation/beauquier \ +self-stabilisation/herman \ +self-stabilisation/israeli-jalfon \ +tandem Index: tests/prism/prism-examples/firewire/impl/Makefile.am =================================================================== - --- tests/prism/prism-examples/firewire/impl/Makefile.am (revision 0) +++ tests/prism/prism-examples/firewire/impl/Makefile.am (revision 0) @@ -0,0 +1,40 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_deadline.nm.test \ +parse-prism_firewire.nm.test \ +pp-prism_deadline.nm.test \ +pp-prism_firewire.nm.test \ +parse-pctl_deadline.pctl.test \ +parse-pctl_liveness.pctl.test \ +pp-pctl_deadline.pctl.test \ +pp-pctl_liveness.pctl.test \ +parse-xpctl_deadline.pctl.test \ +parse-xpctl_liveness.pctl.test \ +pp-xpctl_deadline.pctl.test \ +pp-xpctl_liveness.pctl.test \ +parse-xrm_deadline.nm.test \ +parse-xrm_firewire.nm.test \ +pp-xrm_deadline.nm.test \ +pp-xrm_firewire.nm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/firewire/abst/Makefile.am =================================================================== - --- tests/prism/prism-examples/firewire/abst/Makefile.am (revision 0) +++ tests/prism/prism-examples/firewire/abst/Makefile.am (revision 0) @@ -0,0 +1,40 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_deadline.nm.test \ +parse-prism_firewire.nm.test \ +pp-prism_deadline.nm.test \ +pp-prism_firewire.nm.test \ +parse-pctl_deadline.pctl.test \ +parse-pctl_liveness.pctl.test \ +pp-pctl_deadline.pctl.test \ +pp-pctl_liveness.pctl.test \ +parse-xpctl_deadline.pctl.test \ +parse-xpctl_liveness.pctl.test \ +pp-xpctl_deadline.pctl.test \ +pp-xpctl_liveness.pctl.test \ +parse-xrm_deadline.nm.test \ +parse-xrm_firewire.nm.test \ +pp-xrm_deadline.nm.test \ +pp-xrm_firewire.nm.test + +EXTRA_DIST = auto README Index: tests/prism/prism-examples/phil_lss/Makefile.am =================================================================== - --- tests/prism/prism-examples/phil_lss/Makefile.am (revision 0) +++ tests/prism/prism-examples/phil_lss/Makefile.am (revision 0) @@ -0,0 +1,40 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-prism_phil_lss3.nm.test \ +parse-prism_phil_lss4.nm.test \ +pp-prism_phil_lss3.nm.test \ +pp-prism_phil_lss4.nm.test \ +parse-pctl_phil_lss3.pctl.test \ +parse-pctl_phil_lss4.pctl.test \ +pp-pctl_phil_lss3.pctl.test \ +pp-pctl_phil_lss4.pctl.test \ +parse-xpctl_phil_lss3.pctl.test \ +parse-xpctl_phil_lss4.pctl.test \ +pp-xpctl_phil_lss3.pctl.test \ +pp-xpctl_phil_lss4.pctl.test \ +parse-xrm_phil_lss3.nm.test \ +parse-xrm_phil_lss4.nm.test \ +pp-xrm_phil_lss3.nm.test \ +pp-xrm_phil_lss4.nm.test + +EXTRA_DIST = auto README Index: tests/prism/Makefile.am =================================================================== - --- tests/prism/Makefile.am (revision 0) +++ tests/prism/Makefile.am (revision 0) @@ -0,0 +1,80 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +SUBDIRS = . prism-examples + +TESTS = \ +parse-prism_const.pm.test \ +parse-prism_desugar_builtins.pm.test \ +parse-prism_desugar-const.pm.test \ +parse-prism_formula.pm.test \ +parse-prism_man_example1.pm.test \ +parse-prism_man_example2.pm.test \ +parse-prism_messy.pm.test \ +parse-prism_range-desugar.pm.test \ +parse-prism_simple_01.pm.test \ +parse-prism_simple-label.pm.test \ +parse-prism_systems.pm.test \ +parse-prism_testeq.pm.test \ +pp-prism_const.pm.test \ +pp-prism_desugar_builtins.pm.test \ +pp-prism_desugar-const.pm.test \ +pp-prism_formula.pm.test \ +pp-prism_man_example1.pm.test \ +pp-prism_man_example2.pm.test \ +pp-prism_messy.pm.test \ +pp-prism_range-desugar.pm.test \ +pp-prism_simple_01.pm.test \ +pp-prism_simple-label.pm.test \ +pp-prism_systems.pm.test \ +pp-prism_testeq.pm.test \ +parse-xrm_const.pm.test \ +parse-xrm_desugar_builtins.pm.test \ +parse-xrm_desugar-const.pm.test \ +parse-xrm_formula.pm.test \ +parse-xrm_man_example1.pm.test \ +parse-xrm_man_example2.pm.test \ +parse-xrm_messy.pm.test \ +parse-xrm_range-desugar.pm.test \ +parse-xrm_simple_01.pm.test \ +parse-xrm_simple-label.pm.test \ +parse-xrm_systems.pm.test \ +parse-xrm_testeq.pm.test \ +pp-xrm_const.pm.test \ +pp-xrm_desugar_builtins.pm.test \ +pp-xrm_desugar-const.pm.test \ +pp-xrm_formula.pm.test \ +pp-xrm_man_example1.pm.test \ +pp-xrm_man_example2.pm.test \ +pp-xrm_messy.pm.test \ +pp-xrm_range-desugar.pm.test \ +pp-xrm_simple_01.pm.test \ +pp-xrm_simple-label.pm.test \ +pp-xrm_systems.pm.test \ +pp-xrm_testeq.pm.test + +XFAIL_TESTS = \ +parse-prism_systems.pm.test \ +pp-prism_systems.pm.test \ +parse-xrm_systems.pm.test \ +pp-xrm_systems.pm.test + +EXTRA_DIST = *.pm Index: tests/test-parse-xpctl.sh.in =================================================================== - --- tests/test-parse-xpctl.sh.in (revision 96) +++ tests/test-parse-xpctl.sh.in (working copy) @@ -18,28 +18,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +: ${top_builddir=@top_builddir@} +: ${srcdir=@srcdir@} +testname=`echo "$0" | sed 's/^[^_]*_\(..*\)\.test$/\1/'` +test -f "$testname" && set dummy "$testname" && shift +test -f "$srcdir/$testname" && set dummy "$srcdir/$testname" && shift - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' - -rm -f failed_tests.$$ - - - -for file in `find "$srcdir" -name '*.pctl' -o -name '*.csl' -o -name '*.xpctl' -o -name '*.xcsl' | sort`; do - - echo @ECHO_N@ " Parsing `basename $file` ... " - - "@top_builddir@/src/tools/parse-xpctl" -i "$file" -o /dev/null - - rv=$? - - test_cnt=$((test_cnt + 1)) - - if [ $rv -eq 0 ]; then - - echo 'OK, no ambiguities found' - - test_pass=$((test_pass + 1)) - - else - - echo " * $file: FAILED (bad return value: $rv)" >> failed_tests.$$ - - continue - - fi - -done - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -f failed_tests.$$ - - - -test $test_pass -eq $test_cnt +exec "$top_builddir/tests/test-parser.sh" "$top_builddir/src/tools/parse-xpctl" \ + 'pctl,csl,xpctl,xcsl' "$1" Index: tests/test-parse-prism.sh.in =================================================================== - --- tests/test-parse-prism.sh.in (revision 96) +++ tests/test-parse-prism.sh.in (working copy) @@ -18,28 +18,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +: ${top_builddir=@top_builddir@} +: ${srcdir=@srcdir@} +testname=`echo "$0" | sed 's/^[^_]*_\(..*\)\.test$/\1/'` +test -f "$testname" && set dummy "$testname" && shift +test -f "$srcdir/$testname" && set dummy "$srcdir/$testname" && shift - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' - -rm -f failed_tests.$$ - - - -for file in `find "$srcdir" -name '*.pm' -o -name '*.nm' -o -name '*.sm' | sort`; do - - echo @ECHO_N@ " Parsing `basename $file` ... " - - "@top_builddir@/src/tools/parse-prism" -i "$file" -o /dev/null - - rv=$? - - test_cnt=$((test_cnt + 1)) - - if [ $rv -eq 0 ]; then - - echo 'OK, no ambiguities found' - - test_pass=$((test_pass + 1)) - - else - - echo " * $file: FAILED (bad return value: $rv)" >> failed_tests.$$ - - continue - - fi - -done - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -f failed_tests.$$ - - - -test $test_pass -eq $test_cnt +exec "$top_builddir/tests/test-parser.sh" "$top_builddir/src/tools/parse-prism" \ + 'pm,nm,sm' "$1" Index: tests/test-pp-xpctl.sh.in =================================================================== - --- tests/test-pp-xpctl.sh.in (revision 96) +++ tests/test-pp-xpctl.sh.in (working copy) @@ -18,100 +18,12 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' - -target_dir='output-pp-xpctl' - -rm -f failed_tests.$$ - - - -test ! -d $target_dir && { mkdir $target_dir \ - - || { echo "Cannot create $target_dir/ directory" && exit 1; } } - - - -cd $target_dir - -outdir="`pwd`" - -cd .. - - - -for file in `find "$srcdir" -name '*.pctl' -o -name '*.csl' -o -name '*.xpctl' -o -name '*.xcsl' | sort`; do - - basefile="`basename $file`" - - bfile="`echo \"$basefile\" | sed 's/\.x\?pctl$//;s/\.x\?csl//'`" - - - - echo ">>> Starting the test for $basefile" - - test_cnt=$((test_cnt + 1)) - - - - echo @ECHO_N@ " Parsing $basefile ... " - - "@top_builddir@/src/tools/parse-xpctl" -i "$file" -o "$outdir/$bfile.aterm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: parsing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK, no ambiguities found' - - - - echo @ECHO_N@ " Pretty printing $basefile ... " - - "@top_builddir@/src/tools/pp-xpctl" \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.pp.xpctl" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: pretty printing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK' - - - - echo @ECHO_N@ " Re-Parsing pretty printed file $basefile ... " - - "@top_builddir@/src/tools/parse-xpctl" \ - - -i "$outdir/$bfile.pp.xpctl" -o "$outdir/$bfile.pp2aterm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, here is the content of the file:' - - echo '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' - - cat -n "$outdir/$bfile.pp.xpctl" - - echo '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<' - - echo 'Now continuing with the next test...' - - echo " * $file: re-parsing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK, no ambiguities found' - - - - echo @ECHO_N@ " Re-Pretty printing the re-parsed file $basefile ... " - - "@top_builddir@/src/tools/pp-xpctl" \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2.xpctl" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: re-pretty printing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK' - - - - err='' - - diff -q "$outdir/$bfile.aterm" "$outdir/$bfile.pp2aterm" || err='aterm' - - diff -q "$outdir/$bfile.pp.xpctl" "$outdir/$bfile.pp2.xpctl" || err="$err+pp" - - - - case $err in - - *aterm*) - - echo 'FAILED: the two parses did NOT produce the same AST:' - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.aterm.pp" - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2aterm.pp" - - diff -u "$outdir/$bfile.aterm.pp" "$outdir/$bfile.pp2aterm.pp" - - echo " * $file: both parses did NOT produce the same AST" >> failed_tests.$$ - - continue - - ;; - - *pp*) - - echo 'FAILED: the two pretty printing did NOT produce the same source:' - - diff -u "$outdir/$bfile.pp.xpctl" "$outdir/$bfile.pp2.xpctl" - - echo " * $file: both pretty pretty did NIT produce the same source" >> failed_tests.$$ - - continue - - ;; - - esac - - - - echo "<<< Test for $basefile PASSED" - - test_pass=$((test_pass + 1)) - -done - - - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -rf failed_tests.$$ "$outdir" - - - -test $test_pass -eq $test_cnt +: ${top_builddir=@top_builddir@} +: ${srcdir=@srcdir@} +testname=`echo "$0" | sed 's/^[^_]*_\(..*\)\.test$/\1/'` +test -f "$testname" && set dummy "$testname" && shift +test -f "$srcdir/$testname" && set dummy "$srcdir/$testname" && shift + +exec "$top_builddir/tests/test-pp.sh" "$top_builddir/src/tools/parse-xpctl" \ + "$top_builddir/src/tools/pp-xpctl" \ + 'pctl,csl,xpctl,xcsl' "$1" Index: tests/pctl/Makefile.am =================================================================== - --- tests/pctl/Makefile.am (revision 0) +++ tests/pctl/Makefile.am (revision 0) @@ -0,0 +1,42 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-pctl_longuest-exp-match.pctl.test \ +parse-pctl_man_examples.pctl.test \ +pp-pctl_longuest-exp-match.pctl.test \ +pp-pctl_man_examples.pctl.test \ +parse-xpctl_longuest-exp-match.pctl.test \ +parse-xpctl_man_examples.pctl.test \ +parse-xpctl_rivf.xpctl.test \ +parse-xpctl_xrm-formula.xpctl.test \ +pp-xpctl_longuest-exp-match.pctl.test \ +pp-xpctl_man_examples.pctl.test \ +pp-xpctl_rivf.xpctl.test \ +pp-xpctl_xrm-formula.xpctl.test + +XFAIL_TESTS = \ +parse-pctl_longuest-exp-match.pctl.test \ +pp-pctl_longuest-exp-match.pctl.test \ +parse-xpctl_longuest-exp-match.pctl.test \ +pp-xpctl_longuest-exp-match.pctl.test + +EXTRA_DIST = *.pctl *.xpctl Index: tests/test-pp-prism.sh.in =================================================================== - --- tests/test-pp-prism.sh.in (revision 96) +++ tests/test-pp-prism.sh.in (working copy) @@ -18,100 +18,12 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' - -target_dir='output-pp-prism' - -rm -f failed_tests.$$ - - - -test ! -d $target_dir && { mkdir $target_dir \ - - || { echo "Cannot create $target_dir/ directory" && exit 1; } } - - - -cd $target_dir - -outdir="`pwd`" - -cd .. - - - -for file in `find "$srcdir" -name '*.pm' -o -name '*.nm' -o -name '*.sm' | sort`; do - - basefile="`basename $file`" - - bfile="`echo \"$basefile\" | sed 's/\.pm$//'`" - - - - echo ">>> Starting the test for $basefile" - - test_cnt=$((test_cnt + 1)) - - - - echo @ECHO_N@ " Parsing $basefile ... " - - "@top_builddir@/src/tools/parse-prism" -i "$file" -o "$outdir/$bfile.aterm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: parsing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK, no ambiguities found' - - - - echo @ECHO_N@ " Pretty printing $basefile ... " - - "@top_builddir@/src/tools/pp-prism" \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.pp.pm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: pretty printing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK' - - - - echo @ECHO_N@ " Re-Parsing pretty printed file $basefile ... " - - "@top_builddir@/src/tools/parse-prism" \ - - -i "$outdir/$bfile.pp.pm" -o "$outdir/$bfile.pp2aterm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, here is the content of the file:' - - echo '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' - - cat -n "$outdir/$bfile.pp.pm" - - echo '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<' - - echo 'Now continuing with the next test...' - - echo " * $file: re-parsing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK, no ambiguities found' - - - - echo @ECHO_N@ " Re-Pretty printing the re-parsed file $basefile ... " - - "@top_builddir@/src/tools/pp-prism" \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2.pm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: re-pretty printing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK' - - - - err='' - - diff -q "$outdir/$bfile.aterm" "$outdir/$bfile.pp2aterm" || err='aterm' - - diff -q "$outdir/$bfile.pp.pm" "$outdir/$bfile.pp2.pm" || err="$err+pp" - - - - case $err in - - *aterm*) - - echo 'FAILED: the two parses did NOT produce the same AST:' - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.aterm.pp" - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2aterm.pp" - - diff -u "$outdir/$bfile.aterm.pp" "$outdir/$bfile.pp2aterm.pp" - - echo " * $file: both parses did NOT produce the same AST" >> failed_tests.$$ - - continue - - ;; - - *pp*) - - echo 'FAILED: the two pretty printing did NOT produce the same source:' - - diff -u "$outdir/$bfile.pp.pm" "$outdir/$bfile.pp2.pm" - - echo " * $file: both pretty pretty did NIT produce the same source" >> failed_tests.$$ - - continue - - ;; - - esac - - - - echo "<<< Test for $basefile PASSED" - - test_pass=$((test_pass + 1)) - -done - - - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -rf failed_tests.$$ "$outdir" - - - -test $test_pass -eq $test_cnt +: ${top_builddir=@top_builddir@} +: ${srcdir=@srcdir@} +testname=`echo "$0" | sed 's/^[^_]*_\(..*\)\.test$/\1/'` +test -f "$testname" && set dummy "$testname" && shift +test -f "$srcdir/$testname" && set dummy "$srcdir/$testname" && shift + +exec "$top_builddir/tests/test-pp.sh" "$top_builddir/src/tools/parse-prism" \ + "$top_builddir/src/tools/pp-prism" \ + 'pm,nm,sm' "$1" Index: tests/gen_tests.sh =================================================================== - --- tests/gen_tests.sh (revision 0) +++ tests/gen_tests.sh (revision 0) @@ -0,0 +1,25 @@ +#!/bin/sh +# Simple shell script used to generate the content of the Makefile.am + +# add_files prog [files...] +add_files() +{ + prog=$1 + shift + for i in "$@"; do + test -f "$i" && + echo "$i" | tr ' ' '\n' | sed "s/\$/.test/;s/^/${prog}_/" + done +} + +echo 'TESTS = \' >>Makefile.am +( +add_files parse-prism *.pm *.nm *.sm +add_files pp-prism *.pm *.nm *.sm +add_files parse-pctl *.pctl *.csl +add_files pp-pctl *.pctl *.csl +add_files parse-xpctl *.pctl *.xpctl *.csl *.xcsl +add_files pp-xpctl *.pctl *.xpctl *.csl *.xcsl +add_files parse-xrm *.pm *.nm *.sm *.xpm *.xrm +add_files pp-xrm *.pm *.nm *.sm *.xpm *.xrm +) | sed '$!s/$/ \\/' >>Makefile.am Property changes on: tests/gen_tests.sh ___________________________________________________________________ Name: svn:executable + * Name: svn:eol-style + native Index: tests/test-parse-pctl.sh.in =================================================================== - --- tests/test-parse-pctl.sh.in (revision 96) +++ tests/test-parse-pctl.sh.in (working copy) @@ -18,28 +18,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +: ${top_builddir=@top_builddir@} +: ${srcdir=@srcdir@} +testname=`echo "$0" | sed 's/^[^_]*_\(..*\)\.test$/\1/'` +test -f "$testname" && set dummy "$testname" && shift +test -f "$srcdir/$testname" && set dummy "$srcdir/$testname" && shift - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' - -rm -f failed_tests.$$ - - - -for file in `find "$srcdir" -name '*.pctl' -o -name '*.csl' | sort`; do - - echo @ECHO_N@ " Parsing `basename $file` ... " - - "@top_builddir@/src/tools/parse-pctl" -i "$file" -o /dev/null - - rv=$? - - test_cnt=$((test_cnt + 1)) - - if [ $rv -eq 0 ]; then - - echo 'OK, no ambiguities found' - - test_pass=$((test_pass + 1)) - - else - - echo " * $file: FAILED (bad return value: $rv)" >> failed_tests.$$ - - continue - - fi - -done - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -f failed_tests.$$ - - - -test $test_pass -eq $test_cnt +exec "$top_builddir/tests/test-parser.sh" "$top_builddir/src/tools/parse-pctl" \ + 'pctl,csl' "$1" Index: tests/xrm/Makefile.am =================================================================== - --- tests/xrm/Makefile.am (revision 0) +++ tests/xrm/Makefile.am (revision 0) @@ -0,0 +1,120 @@ +# +# This file is part of XRM. +# Copyright (C) 2006 Benoit Sigoure. +# +# XRM is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, +# USA. + +include $(top_srcdir)/tests/make-tests.mk + +TESTS = \ +parse-xrm_amb-formula.xrm.test \ +parse-xrm_amb-if-exp.xrm.test \ +parse-xrm_amb-if-pp.xrm.test \ +parse-xrm_array-decl_1d.xrm.test \ +parse-xrm_array-decl_2d.xrm.test \ +parse-xrm_array-decl_3d.xrm.test \ +parse-xrm_array-decl_dim_exp.xrm.test \ +parse-xrm_array-decl-with-meta-and-non-meta-and-exp.xrm.test \ +parse-xrm_array-decl-with-meta-and-non-meta.xrm.test \ +parse-xrm_array_with_static_dim.xrm.test \ +parse-xrm_cond-array-access.xrm.test \ +parse-xrm_consts.xrm.test \ +parse-xrm_decl-cmd-list.xrm.test \ +parse-xrm_dec-list.xrm.test \ +parse-xrm_desugar-if.xrm.test \ +parse-xrm_exists-eq.xrm.test \ +parse-xrm_for-in.xrm.test \ +parse-xrm_for-loop-using-const-int.xrm.test \ +parse-xrm_formula-amb.xrm.test \ +parse-xrm_for-with-exps.xrm.test \ +parse-xrm_globals.xrm.test \ +parse-xrm_if-desugar.xrm.test \ +parse-xrm_if-exp.xrm.test \ +parse-xrm_inner-static-for-step.xrm.test \ +parse-xrm_inner-static-for.xrm.test \ +parse-xrm_inner-static-if.xrm.test \ +parse-xrm_labels.xrm.test \ +parse-xrm_negative-rand.xrm.test \ +parse-xrm_outer-static-for-step.xrm.test \ +parse-xrm_outer-static-for.xrm.test \ +parse-xrm_outer-static-if.xrm.test \ +parse-xrm_parametrized-formula.xrm.test \ +parse-xrm_priorities-exp-array-subscript.xrm.test \ +parse-xrm_properties-in-xrm.xrm.test \ +parse-xrm_rand.xrm.test \ +parse-xrm_recursive-formula.xrm.test \ +parse-xrm_rivf.xrm.test \ +parse-xrm_simple_01.xrm.test \ +parse-xrm_static-const-arrays-desugar.xrm.test \ +parse-xrm_static-for-step.xrm.test \ +parse-xrm_static-for.xrm.test \ +parse-xrm_static-if.xrm.test \ +parse-xrm_static_rand.xrm.test \ +pp-xrm_amb-formula.xrm.test \ +pp-xrm_amb-if-exp.xrm.test \ +pp-xrm_amb-if-pp.xrm.test \ +pp-xrm_array-decl_1d.xrm.test \ +pp-xrm_array-decl_2d.xrm.test \ +pp-xrm_array-decl_3d.xrm.test \ +pp-xrm_array-decl_dim_exp.xrm.test \ +pp-xrm_array-decl-with-meta-and-non-meta-and-exp.xrm.test \ +pp-xrm_array-decl-with-meta-and-non-meta.xrm.test \ +pp-xrm_array_with_static_dim.xrm.test \ +pp-xrm_cond-array-access.xrm.test \ +pp-xrm_consts.xrm.test \ +pp-xrm_decl-cmd-list.xrm.test \ +pp-xrm_dec-list.xrm.test \ +pp-xrm_desugar-if.xrm.test \ +pp-xrm_exists-eq.xrm.test \ +pp-xrm_for-in.xrm.test \ +pp-xrm_for-loop-using-const-int.xrm.test \ +pp-xrm_formula-amb.xrm.test \ +pp-xrm_for-with-exps.xrm.test \ +pp-xrm_globals.xrm.test \ +pp-xrm_if-desugar.xrm.test \ +pp-xrm_if-exp.xrm.test \ +pp-xrm_inner-static-for-step.xrm.test \ +pp-xrm_inner-static-for.xrm.test \ +pp-xrm_inner-static-if.xrm.test \ +pp-xrm_labels.xrm.test \ +pp-xrm_negative-rand.xrm.test \ +pp-xrm_outer-static-for-step.xrm.test \ +pp-xrm_outer-static-for.xrm.test \ +pp-xrm_outer-static-if.xrm.test \ +pp-xrm_parametrized-formula.xrm.test \ +pp-xrm_priorities-exp-array-subscript.xrm.test \ +pp-xrm_properties-in-xrm.xrm.test \ +pp-xrm_rand.xrm.test \ +pp-xrm_recursive-formula.xrm.test \ +pp-xrm_rivf.xrm.test \ +pp-xrm_simple_01.xrm.test \ +pp-xrm_static-const-arrays-desugar.xrm.test \ +pp-xrm_static-for-step.xrm.test \ +pp-xrm_static-for.xrm.test \ +pp-xrm_static-if.xrm.test \ +pp-xrm_static_rand.xrm.test + +XFAIL_TESTS = \ +parse-xrm_amb-if-exp.xrm.test \ +pp-xrm_amb-if-exp.xrm.test \ +pp-xrm_cond-array-access.xrm.test \ +pp-xrm_for-with-exps.xrm.test \ +pp-xrm_if-exp.xrm.test \ +pp-xrm_negative-rand.xrm.test \ +pp-xrm_properties-in-xrm.xrm.test \ +pp-xrm_rivf.xrm.test + +EXTRA_DIST = *.xrm Index: tests/test-parse-xrm.sh.in =================================================================== - --- tests/test-parse-xrm.sh.in (revision 96) +++ tests/test-parse-xrm.sh.in (working copy) @@ -18,28 +18,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +: ${top_builddir=@top_builddir@} +: ${srcdir=@srcdir@} +testname=`echo "$0" | sed 's/^[^_]*_\(..*\)\.test$/\1/'` +test -f "$testname" && set dummy "$testname" && shift +test -f "$srcdir/$testname" && set dummy "$srcdir/$testname" && shift - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' - -rm -f failed_tests.$$ - - - -for file in `find "$srcdir" -name '*.pm' -o -name '*.nm' -o -name '*.sm' -o -name '*.xrm' | sort`; do - - echo @ECHO_N@ " Parsing `basename $file` ... " - - "@top_builddir@/src/tools/parse-xrm" -i "$file" -o /dev/null - - rv=$? - - test_cnt=$((test_cnt + 1)) - - if [ $rv -eq 0 ]; then - - echo 'OK, no ambiguities found' - - test_pass=$((test_pass + 1)) - - else - - echo " * $file: FAILED (bad return value: $rv)" >> failed_tests.$$ - - continue - - fi - -done - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -f failed_tests.$$ - - - -test $test_pass -eq $test_cnt +exec "$top_builddir/tests/test-parser.sh" "$top_builddir/src/tools/parse-xrm" \ + 'pm,nm,sm,xrm' "$1" Index: tests/Makefile.am =================================================================== - --- tests/Makefile.am (revision 96) +++ tests/Makefile.am (working copy) @@ -17,10 +17,9 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -#include $(top_srcdir)/config/toplevel.mk - - dist_check_SCRIPTS = \ + test-parser.sh \ + test-pp.sh \ test-parse-prism.sh \ test-parse-pctl.sh \ test-parse-xrm.sh \ @@ -31,22 +30,8 @@ test-pp-xpctl.sh \ test-xrm-front.sh - -# Set the XTC_REPOSITORY environment variable so that we override the XTC - -# repos used to lookup the tools we're building. We need this because our XTC - -# repos might not yet be installed (make all check install) and the tool we're - -# testing will expect to find it in the place were it will be installed. Hence - -# the need to override the location of that very repository :) - -TESTS_ENVIRONMENT = XTC_REPOSITORY="$(BUILD_REPOSITORY)" - - - -TESTS = test-parse-prism.sh \ - - test-parse-pctl.sh \ - - test-parse-xrm.sh \ - - test-parse-xpctl.sh \ - - test-pp-prism.sh \ - - test-pp-pctl.sh \ - - test-pp-xrm.sh \ - - test-pp-xpctl.sh \ - - test-xrm-front.sh \ - - test-summary.sh +SUBDIRS = . prism pctl xrm +EXTRA_DIST = gen_tests.sh - -EXTRA_DIST = prism xrm test-summary.sh +clean-local: + $(RM) -rf output-*/ Index: tests/test-pp.sh.in =================================================================== - --- tests/test-pp.sh.in (revision 96) +++ tests/test-pp.sh.in (working copy) @@ -18,100 +18,168 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. +# Usage: test-pp.sh <parser> <pretty-printer> <extensions> [args] - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' - -target_dir='output-pp-xrm' - -rm -f failed_tests.$$ +test x"$DEBUG" != x && set -x +me=`basename "$0"` + +parser=$1 +test -x "$parser" || { + echo "$ne: Cannot find the parser $parser" >&2 + exit 1 +} +shift + +prettyprinter=$1 +test -x "$prettyprinter" || { + echo "$ne: Cannot find the pretty printer $prettyprinter" >&2 + exit 1 +} +shift +b_prettyprinter=`basename "$prettyprinter"` + +extensions=$1 +test x"$extensions" = x && { + echo "Usage: $me <parser> <extensions> [file] +eg: $me parse-foo foo,bar +Will run parse-foo on *.foo and *.bar in srcdir" >&2 + exit 1 +} +shift + +: ${top_builddir=@top_builddir@} +target_dir="$top_builddir/tests/output-$b_prettyprinter" test ! -d $target_dir && { mkdir $target_dir \ || { echo "Cannot create $target_dir/ directory" && exit 1; } } - -cd $target_dir - -outdir="`pwd`" - -cd .. - - - -for file in `find "$srcdir" -name '*.pm' -o -name '*.nm' -o -name '*.sm' -o -name '*.xrm' | sort`; do - - basefile="`basename $file`" - - bfile="`echo \"$basefile\" | sed 's/\.\(xrm\|pm\)$//'`" +here=`pwd` +cd "$target_dir" +outdir=`pwd` +cd "$here" + +# run cmd +run() +{ + "$@" || { + rv=$? + echo "Failed to run $* (return value: $rv)" >&2 + exit $rv + } +} + +# This function is highly impure and assumes that many variables are already +# set. +cmp_output() +{ + err='' + cmp -s "$outdir/$bfile.aterm" "$outdir/$bfile.pp2aterm" || err='aterm' + cmp -s "$outdir/$bfile.pp.$this_ext" "$outdir/$bfile.pp2.$this_ext" \ + || err="$err+pp" + + case $err in + *aterm*) + echo 'FAILED: the two parses did NOT produce the same AST:' >&2 + @STRATEGOXT@/bin/pp-aterm \ + -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.aterm.pp" + @STRATEGOXT@/bin/pp-aterm \ + -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2aterm.pp" + diff -u "$outdir/$bfile.aterm.pp" "$outdir/$bfile.pp2aterm.pp" >&2 + ;; + *pp*) + echo 'FAILED: the two pretty printing did NOT produce the same source:' >&2 + diff -u "$outdir/$bfile.pp.$this_ext" "$outdir/$bfile.pp2.$this_ext" >&2 + ;; + esac + test x"$err" = x + return $? +} + +# Transform: a list such as: foo,bar +# in a sed script: s/\.foo$//;s/\.bar$// +sed_remove_ext=`echo "$extensions" \ + | sed 's@^@s/\\.@;s@,@$//;s/\\.@g;s@$@$//@'` +# Get the extension of a file. +sed_get_ext='s/^.*\.\([^.]*\)$/\1/' + +if [ x"$1" != x ]; then + test -f "$1" || { + echo "$me: Error: '$1' no such file or directory." >&2 + exit 1 + } + + file=$1 + basefile=`basename "$file"` + bfile=`echo "$basefile" | sed "$sed_remove_ext"` + this_ext=`echo "$basefile" | sed "$sed_get_ext"` + + test x"$VERBOSE" = x && exec 2>/dev/null + run "$parser" -i "$file" -o "$outdir/$bfile.aterm" + run "$prettyprinter" -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.pp.$this_ext" + run "$parser" -i "$outdir/$bfile.pp.$this_ext" -o "$outdir/$bfile.pp2aterm" + run "$prettyprinter" -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2.$this_ext" + cmp_output || exit 1 + exit 0 +fi + +sed_ext='s/^/-name *./;s/,/ -o -name *./g' +find_extensions=`echo "$extensions" | sed "$sed_ext"` + +: ${srcdir=@srcdir@} + +test_cnt=0 +test_pass=0 + +for file in `find "$srcdir" $find_extensions | sort`; do + basefile=`basename "$file"` + bfile=`echo "$basefile" | sed "$sed_remove_ext"` + this_ext=`echo "$basefile" | sed "$sed_get_ext"` echo ">>> Starting the test for $basefile" test_cnt=$((test_cnt + 1)) echo @ECHO_N@ " Parsing $basefile ... " - - "@top_builddir@/src/tools/parse-xrm" -i "$file" -o "$outdir/$bfile.aterm" + "$parser" -i "$file" -o "$outdir/$bfile.aterm" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' - - echo " * $file: parsing FAILED" >> failed_tests.$$ continue fi echo 'OK, no ambiguities found' echo @ECHO_N@ " Pretty printing $basefile ... " - - "@top_builddir@/src/tools/pp-xrm" \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.pp.xpm" + "$prettyprinter" -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.pp.$this_ext" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' - - echo " * $file: pretty printing FAILED" >> failed_tests.$$ continue fi echo 'OK' echo @ECHO_N@ " Re-Parsing pretty printed file $basefile ... " - - "@top_builddir@/src/tools/parse-xrm" \ - - -i "$outdir/$bfile.pp.xpm" -o "$outdir/$bfile.pp2aterm" + "$parser" -i "$outdir/$bfile.pp.$this_ext" -o "$outdir/$bfile.pp2aterm" if [ $? -ne 0 ]; then echo 'FAILED, here is the content of the file:' echo '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' - - cat -n "$outdir/$bfile.pp.xpm" + cat -n "$outdir/$bfile.pp.$this_ext" echo '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<' echo 'Now continuing with the next test...' - - echo " * $file: re-parsing FAILED" >> failed_tests.$$ continue fi echo 'OK, no ambiguities found' echo @ECHO_N@ " Re-Pretty printing the re-parsed file $basefile ... " - - "@top_builddir@/src/tools/pp-xrm" \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2.xpm" + "$prettyprinter" -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2.$this_ext" if [ $? -ne 0 ]; then echo 'FAILED, continuing with the next test...' - - echo " * $file: re-pretty printing FAILED" >> failed_tests.$$ continue fi echo 'OK' - - err='' - - diff -q "$outdir/$bfile.aterm" "$outdir/$bfile.pp2aterm" || err='aterm' - - diff -q "$outdir/$bfile.pp.xpm" "$outdir/$bfile.pp2.xpm" || err="$err+pp" - - - - case $err in - - *aterm*) - - echo 'FAILED: the two parses did NOT produce the same AST:' - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.aterm.pp" - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2aterm.pp" - - diff -u "$outdir/$bfile.aterm.pp" "$outdir/$bfile.pp2aterm.pp" - - echo " * $file: both parses did NOT produce the same AST" >> failed_tests.$$ - - continue - - ;; - - *pp*) - - echo 'FAILED: the two pretty printing did NOT produce the same source:' - - diff -u "$outdir/$bfile.pp.xpm" "$outdir/$bfile.pp2.xpm" - - echo " * $file: both pretty pretty did NIT produce the same source" >> failed_tests.$$ - - continue - - ;; - - esac + cmp_output || continue echo "<<< Test for $basefile PASSED" test_pass=$((test_pass + 1)) done - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -rf failed_tests.$$ "$outdir" +echo "$b_prettyprinter: $test_pass/$test_cnt tests passed" test $test_pass -eq $test_cnt Index: tests/test-pp-pctl.sh.in =================================================================== - --- tests/test-pp-pctl.sh.in (revision 96) +++ tests/test-pp-pctl.sh.in (working copy) @@ -18,100 +18,12 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' - -target_dir='output-pp-pctl' - -rm -f failed_tests.$$ - - - -test ! -d $target_dir && { mkdir $target_dir \ - - || { echo "Cannot create $target_dir/ directory" && exit 1; } } - - - -cd $target_dir - -outdir="`pwd`" - -cd .. - - - -for file in `find "$srcdir" -name '*.pctl' -o -name '*.csl' | sort`; do - - basefile="`basename $file`" - - bfile="`echo \"$basefile\" | sed 's/\.x\?pm$//'`" - - - - echo ">>> Starting the test for $basefile" - - test_cnt=$((test_cnt + 1)) - - - - echo @ECHO_N@ " Parsing $basefile ... " - - "@top_builddir@/src/tools/parse-pctl" -i "$file" -o "$outdir/$bfile.aterm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: parsing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK, no ambiguities found' - - - - echo @ECHO_N@ " Pretty printing $basefile ... " - - "@top_builddir@/src/tools/pp-pctl" \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.pp.xpm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: pretty printing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK' - - - - echo @ECHO_N@ " Re-Parsing pretty printed file $basefile ... " - - "@top_builddir@/src/tools/parse-pctl" \ - - -i "$outdir/$bfile.pp.xpm" -o "$outdir/$bfile.pp2aterm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, here is the content of the file:' - - echo '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' - - cat -n "$outdir/$bfile.pp.xpm" - - echo '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<' - - echo 'Now continuing with the next test...' - - echo " * $file: re-parsing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK, no ambiguities found' - - - - echo @ECHO_N@ " Re-Pretty printing the re-parsed file $basefile ... " - - "@top_builddir@/src/tools/pp-pctl" \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2.xpm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: re-pretty printing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK' - - - - err='' - - diff -q "$outdir/$bfile.aterm" "$outdir/$bfile.pp2aterm" || err='aterm' - - diff -q "$outdir/$bfile.pp.xpm" "$outdir/$bfile.pp2.xpm" || err="$err+pp" - - - - case $err in - - *aterm*) - - echo 'FAILED: the two parses did NOT produce the same AST:' - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.aterm.pp" - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2aterm.pp" - - diff -u "$outdir/$bfile.aterm.pp" "$outdir/$bfile.pp2aterm.pp" - - echo " * $file: both parses did NOT produce the same AST" >> failed_tests.$$ - - continue - - ;; - - *pp*) - - echo 'FAILED: the two pretty printing did NOT produce the same source:' - - diff -u "$outdir/$bfile.pp.xpm" "$outdir/$bfile.pp2.xpm" - - echo " * $file: both pretty pretty did NIT produce the same source" >> failed_tests.$$ - - continue - - ;; - - esac - - - - echo "<<< Test for $basefile PASSED" - - test_pass=$((test_pass + 1)) - -done - - - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -rf failed_tests.$$ "$outdir" - - - -test $test_pass -eq $test_cnt +: ${top_builddir=@top_builddir@} +: ${srcdir=@srcdir@} +testname=`echo "$0" | sed 's/^[^_]*_\(..*\)\.test$/\1/'` +test -f "$testname" && set dummy "$testname" && shift +test -f "$srcdir/$testname" && set dummy "$srcdir/$testname" && shift + +exec "$top_builddir/tests/test-pp.sh" "$top_builddir/src/tools/parse-pctl" \ + "$top_builddir/src/tools/pp-pctl" \ + 'pctl,csl' "$1" Index: tests/test-pp-xrm.sh.in =================================================================== - --- tests/test-pp-xrm.sh.in (revision 96) +++ tests/test-pp-xrm.sh.in (working copy) @@ -18,100 +18,12 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -test_cnt=0 - -test_pass=0 - -srcdir='@srcdir@' - -target_dir='output-pp-xrm' - -rm -f failed_tests.$$ - - - -test ! -d $target_dir && { mkdir $target_dir \ - - || { echo "Cannot create $target_dir/ directory" && exit 1; } } - - - -cd $target_dir - -outdir="`pwd`" - -cd .. - - - -for file in `find "$srcdir" -name '*.pm' -o -name '*.nm' -o -name '*.sm' -o -name '*.xrm' | sort`; do - - basefile="`basename $file`" - - bfile="`echo \"$basefile\" | sed 's/\.\(xrm\|pm\)$//'`" - - - - echo ">>> Starting the test for $basefile" - - test_cnt=$((test_cnt + 1)) - - - - echo @ECHO_N@ " Parsing $basefile ... " - - "@top_builddir@/src/tools/parse-xrm" -i "$file" -o "$outdir/$bfile.aterm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: parsing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK, no ambiguities found' - - - - echo @ECHO_N@ " Pretty printing $basefile ... " - - "@top_builddir@/src/tools/pp-xrm" \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.pp.xpm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: pretty printing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK' - - - - echo @ECHO_N@ " Re-Parsing pretty printed file $basefile ... " - - "@top_builddir@/src/tools/parse-xrm" \ - - -i "$outdir/$bfile.pp.xpm" -o "$outdir/$bfile.pp2aterm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, here is the content of the file:' - - echo '>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>' - - cat -n "$outdir/$bfile.pp.xpm" - - echo '<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<' - - echo 'Now continuing with the next test...' - - echo " * $file: re-parsing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK, no ambiguities found' - - - - echo @ECHO_N@ " Re-Pretty printing the re-parsed file $basefile ... " - - "@top_builddir@/src/tools/pp-xrm" \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2.xpm" - - if [ $? -ne 0 ]; then - - echo 'FAILED, continuing with the next test...' - - echo " * $file: re-pretty printing FAILED" >> failed_tests.$$ - - continue - - fi - - echo 'OK' - - - - err='' - - diff -q "$outdir/$bfile.aterm" "$outdir/$bfile.pp2aterm" || err='aterm' - - diff -q "$outdir/$bfile.pp.xpm" "$outdir/$bfile.pp2.xpm" || err="$err+pp" - - - - case $err in - - *aterm*) - - echo 'FAILED: the two parses did NOT produce the same AST:' - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.aterm" -o "$outdir/$bfile.aterm.pp" - - @STRATEGOXT@/bin/pp-aterm \ - - -i "$outdir/$bfile.pp2aterm" -o "$outdir/$bfile.pp2aterm.pp" - - diff -u "$outdir/$bfile.aterm.pp" "$outdir/$bfile.pp2aterm.pp" - - echo " * $file: both parses did NOT produce the same AST" >> failed_tests.$$ - - continue - - ;; - - *pp*) - - echo 'FAILED: the two pretty printing did NOT produce the same source:' - - diff -u "$outdir/$bfile.pp.xpm" "$outdir/$bfile.pp2.xpm" - - echo " * $file: both pretty pretty did NIT produce the same source" >> failed_tests.$$ - - continue - - ;; - - esac - - - - echo "<<< Test for $basefile PASSED" - - test_pass=$((test_pass + 1)) - -done - - - -echo "$0: $test_pass/$test_cnt tests passed" - -echo "`date` $0: $test_pass/$test_cnt tests passed" >> test_summary - -cat failed_tests.$$ >> test_summary - -rm -rf failed_tests.$$ "$outdir" - - - -test $test_pass -eq $test_cnt +: ${top_builddir=@top_builddir@} +: ${srcdir=@srcdir@} +testname=`echo "$0" | sed 's/^[^_]*_\(..*\)\.test$/\1/'` +test -f "$testname" && set dummy "$testname" && shift +test -f "$srcdir/$testname" && set dummy "$srcdir/$testname" && shift + +exec "$top_builddir/tests/test-pp.sh" "$top_builddir/src/tools/parse-xrm" \ + "$top_builddir/src/tools/pp-xrm" \ + 'pm,nm,sm,xrm' "$1" Index: configure.ac =================================================================== - --- configure.ac (revision 96) +++ configure.ac (working copy) @@ -24,7 +24,7 @@ AC_PREREQ(2.57) - -AC_INIT([xrm], [1.1], [sigoure.benoit@lrde.epita.fr]) +AC_INIT([xrm], [1.1], [benoit.sigoure@lrde.epita.fr]) AC_CONFIG_MACRO_DIR([config]) AC_CONFIG_AUX_DIR([config]) @@ -104,8 +104,40 @@ src/lib/native/Makefile src/tools/Makefile tests/Makefile + tests/prism/Makefile + tests/prism/prism-examples/Makefile + tests/prism/prism-examples/brp/Makefile + tests/prism/prism-examples/fms/Makefile + tests/prism/prism-examples/cell/Makefile + tests/prism/prism-examples/dice/Makefile + tests/prism/prism-examples/pepa/Makefile + tests/prism/prism-examples/phil/original/Makefile + tests/prism/prism-examples/phil/nofair/Makefile + tests/prism/prism-examples/cluster/Makefile + tests/prism/prism-examples/rabin/Makefile + tests/prism/prism-examples/embedded/Makefile + tests/prism/prism-examples/phil_lss/Makefile + tests/prism/prism-examples/firewire/abst/Makefile + tests/prism/prism-examples/firewire/impl/Makefile + tests/prism/prism-examples/kanban/Makefile + tests/prism/prism-examples/leader/synchronous/Makefile + tests/prism/prism-examples/leader/asynchronous/Makefile + tests/prism/prism-examples/molecules/Makefile + tests/prism/prism-examples/mutual/Makefile + tests/prism/prism-examples/tandem/Makefile + tests/prism/prism-examples/polling/Makefile + tests/prism/prism-examples/self-stabilisation/beauquier/Makefile + tests/prism/prism-examples/self-stabilisation/israeli-jalfon/Makefile + tests/prism/prism-examples/self-stabilisation/herman/Makefile + tests/pctl/Makefile + tests/xrm/Makefile ]) +AC_CONFIG_FILES([tests/test-parser.sh], + [chmod a=rx tests/test-parser.sh]) +AC_CONFIG_FILES([tests/test-pp.sh], + [chmod a=rx tests/test-pp.sh]) + AC_CONFIG_FILES([tests/test-parse-prism.sh], [chmod a=rx tests/test-parse-prism.sh]) AC_CONFIG_FILES([tests/test-parse-pctl.sh], Index: config/toplevel.mk (deleted) =================================================================== Index: config/Makefile.am =================================================================== - --- config/Makefile.am (revision 96) +++ config/Makefile.am (working copy) @@ -19,6 +19,4 @@ EXTRA_DIST = \ Makefile.xt \ - - toplevel.mk \ - - Transformers.mk \ autoxt.m4 Index: config/Transformers.mk (deleted) =================================================================== Index: Makefile.am =================================================================== - --- Makefile.am (revision 96) +++ Makefile.am (working copy) @@ -17,14 +17,13 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA. - - - -include $(top_srcdir)/config/toplevel.mk +# We need this in order to get the definition of pkgconfigdir +include $(top_srcdir)/config/Makefile.xt ACLOCAL_AMFLAGS = -I config SUBDIRS = config src tests - -XTC_IMPORT += $(ROOT_XTC_IMPORT) EXTRA_DIST = \ PRISM.notes \ @@ -34,6 +33,17 @@ pkgconfig_DATA = xrm.pc DISTCLEANFILES = $(pkgconfig_DATA) $(BUILD_REPOSITORY) +XTC_IMPORT = $(STRATEGOXT)/share/strategoxt/XTC +XTC_IMPORT += $(ROOT_XTC_IMPORT) + +CLEANFILES = XTC + +uninstall-hook: + @for i in $(DREPOSITORY); do \ + echo "rm -f $$i"; \ + rm -f $$i; \ + done + # Remove the .svn folders included in the tarball dist-hook: find $(distdir) -type d -name '.svn' | xargs rm -rf - -- SIGOURE Benoit aka Tsuna (SUSv3 compliant) _____ "On a long enough timeline, the survival rate /EPITA\ Promo 2008.CSI/ACU for everyone drops to zero" -- Jack. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) iD8DBQFFgX1ewwE67wC8PUkRAriLAJkBkVkneTjT5aRd1m20uD4femfhcwCgpa1Y UG+RmIJ1R6ytgTWAkaemvvQ= =Ub55 -----END PGP SIGNATURE-----
participants (1)
-
SIGOURE Benoit