Nested invokers and delayed events for PROMELA model checking

1 files changed, 21 insertions, 49 deletions

diff --git a/test/ctest/CTestCustom.ctest.in b/test/ctest/CTestCustom.ctest.in
index 609c926..484dcb2 100644
--- a/test/ctest/CTestCustom.ctest.in
+++ b/test/ctest/CTestCustom.ctest.in
@@ -9,6 +9,8 @@
 
 # these are manual or xpath tests generated by the ecma generator
 set(CTEST_CUSTOM_TESTS_IGNORE
+
+  ### Ignore for ECMAScript datamodel
 	"ecma/test178.scxml" # Manual - PASSED
 	"ecma/test230.scxml" # Manual - PASSED
 	"ecma/test250.scxml" # Manual - PASSED
@@ -17,17 +19,21 @@ set(CTEST_CUSTOM_TESTS_IGNORE
 	"ecma/test415.scxml" # Manual - PASSED
   # "ecma/test513.txt" # Manual - PASSED
 
+  ### Ignore for flattened ECMAScript datamodel
 	"fsm/ecma/test178.scxml" # manual test
-  # "fsm/ecma/test224.scxml" # automatically generated id has the form stateid.platformid
 	"fsm/ecma/test230.scxml" # manual test
 	"fsm/ecma/test250.scxml" # manual test
 	"fsm/ecma/test301.scxml" # manual test
 	"fsm/ecma/test307.scxml" # manual test
 	"fsm/ecma/test415.scxml" # manual test
-	
+  # "fsm/ecma/test513.txt" # manual test
+
+  ### Just ignore the XPath datamodel tests that hang, most of the rest fails as well
 	"xpath/test388.scxml" # hangs
 	"xpath/test580.scxml" # hangs
   
+  
+  ### Ignore for PROMELA datamodel
   "promela/test178.scxml" # manual test
   "promela/test190.scxml" # string concatenation
   "promela/test224.scxml" # string operation startWith
@@ -51,24 +57,25 @@ set(CTEST_CUSTOM_TESTS_IGNORE
   "promela/test530.scxml" # assigns DOM node to variable
   "promela/test534.scxml" # string operation contains
   
+  ### Ignore for PROMELA model checking
   # fail for syntax
   "spin/promela/test150.scxml" # test that foreach causes a new variable to be declared
   "spin/promela/test151.scxml" # test that foreach causes a new variable to be declared
   "spin/promela/test152.scxml" # test that an illegal array or item value causes error.execution
   "spin/promela/test156.scxml" # test that an error causes the foreach to stop execution
-  "spin/promela/test172.scxml" # targetexpr _internal - can we support?
+  # "spin/promela/test172.scxml" # targetexpr _internal - can we support?
   "spin/promela/test224.scxml" # string operation startWith
   "spin/promela/test224.scxml" # string operation startWith
-  "spin/promela/test277.scxml" # 'return' as a literal
-  "spin/promela/test280.scxml" # late data binding
-  "spin/promela/test286.scxml" # assigment to a non-declared var
-  "spin/promela/test294.scxml" # mixed types for event.data
+  "spin/promela/test277.scxml" # platform creates unbound variable if we assign an illegal value to it
+  "spin/promela/test280.scxml" # late data binding / undeclared variable
+  "spin/promela/test286.scxml" # assignment to a non-declared var causes an error
+  "spin/promela/test294.scxml" # mixed types for event.data via donedata
   "spin/promela/test301.scxml" # manual test
   "spin/promela/test302.scxml" # variable not declared
   "spin/promela/test304.scxml" # variable not declared
   "spin/promela/test307.scxml" # manual test
   "spin/promela/test309.scxml" # 'return' as an invalid boolean expression ought to eval to false
-  "spin/promela/test311.scxml" # assigment to a non-declared var
+  "spin/promela/test311.scxml" # assignment to a non-declared var
   "spin/promela/test312.scxml" # assignment of 'return'
   "spin/promela/test313.scxml" # assignment of 'return'
   "spin/promela/test314.scxml" # assignment of 'return'
@@ -76,7 +83,7 @@ set(CTEST_CUSTOM_TESTS_IGNORE
   "spin/promela/test324.scxml" # assignment to _name
   "spin/promela/test325.scxml" # assignment from _ioprocessor
   "spin/promela/test326.scxml" # assignment from _ioprocessor
-  "spin/promela/test329.scxml" # several assignment to constants
+  "spin/promela/test329.scxml" # test that none of the system variables can be modified
   "spin/promela/test331.scxml" # assigment to a non-declared var
   "spin/promela/test344.scxml" # 'return' as a cond
   "spin/promela/test346.scxml" # assignment to system variables
@@ -97,52 +104,17 @@ set(CTEST_CUSTOM_TESTS_IGNORE
   
   # fail for semantics
   "spin/promela/test159.scxml" # error raised causes all subsequent elements to be skipped
-  "spin/promela/test175.scxml" # delay used
   "spin/promela/test178.scxml" # manual test with two identical params - failed
-  "spin/promela/test185.scxml" # delay used
-  "spin/promela/test191.scxml" # nested SCXML document
-  "spin/promela/test192.scxml" # delay used and nested SCXML document
   "spin/promela/test194.scxml" # illegal target for send
   "spin/promela/test199.scxml" # invalid send type
-  "spin/promela/test207.scxml" # delay / cancel
-  "spin/promela/test208.scxml" # delay / cancel
-  "spin/promela/test210.scxml" # sendidexpr works with cancel
-  "spin/promela/test215.scxml" # nested SCXML document
-  "spin/promela/test216.scxml" # assignment from file and nested SCXML document
-  "spin/promela/test220.scxml" # nested SCXML document
-  "spin/promela/test223.scxml" # nested SCXML document
-  "spin/promela/test225.scxml" # nested SCXML document - can't we just copy as nested states with event prefixes?
-  "spin/promela/test226.scxml" # assignment from file and nested SCXML document
-  "spin/promela/test228.scxml" # nested SCXML document and invokeid
-  "spin/promela/test229.scxml" # nested SCXML document with autoforward
+  "spin/promela/test207.scxml" # delay / cancel / nested SCXML
+  "spin/promela/test215.scxml" # nested SCXML document with typeexpr at invoke
+  "spin/promela/test216.scxml" # nested SCXML document with srcexpr at invoke
   "spin/promela/test230.scxml" # nested SCXML document with manual test
-  "spin/promela/test232.scxml" # nested SCXML document sends events
-  "spin/promela/test233.scxml" # nested SCXML document with finalize
-  "spin/promela/test234.scxml" # nested SCXML document with finalize
-  "spin/promela/test235.scxml" # nested SCXML document sends done.invoke
-  "spin/promela/test236.scxml" # nested SCXML document sends done.invoke as last event
-  "spin/promela/test239.scxml" # nested SCXML document from content and src
-  "spin/promela/test240.scxml" # nested SCXML document with namelist
-  "spin/promela/test241.scxml" # nested SCXML document with namelist and param
-  "spin/promela/test243.scxml" # nested SCXML document with param
-  "spin/promela/test244.scxml" # nested SCXML document with namelist
-  "spin/promela/test245.scxml" # nested SCXML document with unbound vars
-  "spin/promela/test247.scxml" # nested SCXML document with done.invoke
-  "spin/promela/test253.scxml" # nested SCXML document with bidirectional SCXML ioprocessor
-  "spin/promela/test276.scxml" # nested SCXML document overriding var defaults
   "spin/promela/test298.scxml" # non-existent data model location
   "spin/promela/test332.scxml" # sendid is present in error events
   "spin/promela/test338.scxml" # test that invokeid is set correctly
   "spin/promela/test343.scxml" # test that illegal <param> produces error.execution
-  "spin/promela/test347.scxml" # nested SCXML document with bidirectional SCXML ioprocessor
-  "spin/promela/test351.scxml" # timeout with delay
-  "spin/promela/test352.scxml" # timeout with delay
-  "spin/promela/test342.scxml" # timeout with delay
-  "spin/promela/test388.scxml" # timeout with delay
-  "spin/promela/test399.scxml" # timeout with delay
-  # "spin/promela/test409.scxml" # entering states order - In
-  # "spin/promela/test411.scxml" # entering states order - In
-  "spin/promela/test422.scxml" # nested SCXML document
   "spin/promela/test488.scxml" # illegal expr in <param> produces error.execution
   "spin/promela/test496.scxml" # tests error.communication with illegal target
   "spin/promela/test500.scxml" # uses _ioprocessors.scxml.location
@@ -153,10 +125,10 @@ set(CTEST_CUSTOM_TESTS_IGNORE
   "spin/promela/test531.scxml" # uses _ioprocessors.basichttp.location
   "spin/promela/test532.scxml" # uses _ioprocessors.basichttp.location
   "spin/promela/test552.scxml" # initialize data from file
+  "spin/promela/test553.scxml" # error in namelist
+  "spin/promela/test554.scxml" # evaluation of <invoke>'s args causes an error
   "spin/promela/test567.scxml" # uses _ioprocessors.basichttp.location
   "spin/promela/test577.scxml" # send without target for basichttp
-  "spin/promela/test579.scxml" # timeout with delay
-  "spin/promela/test580.scxml" # timeout with delay
   
   
 )