|
From: <ob...@us...> - 2013-05-27 02:25:46
|
Revision: 1825
http://sourceforge.net/p/scstudio/code/1825
Author: obouda
Date: 2013-05-27 02:25:44 +0000 (Mon, 27 May 2013)
Log Message:
-----------
some more condition tests
Modified Paths:
--------------
branches/conditions/tests/time/time_race/CMakeLists.txt
Added Paths:
-----------
branches/conditions/tests/time/time_race/race_cond_neg1.mpr
branches/conditions/tests/time/time_race/race_cond_neg1.mpr.result
branches/conditions/tests/time/time_race/race_cond_neg1.vsd
branches/conditions/tests/time/time_race/race_cond_pos2.mpr
branches/conditions/tests/time/time_race/race_cond_pos2.vsd
branches/conditions/tests/time/time_race/race_cond_pos3.mpr
branches/conditions/tests/time/time_race/race_cond_pos3.vsd
Modified: branches/conditions/tests/time/time_race/CMakeLists.txt
===================================================================
--- branches/conditions/tests/time/time_race/CMakeLists.txt 2013-05-27 01:44:38 UTC (rev 1824)
+++ branches/conditions/tests/time/time_race/CMakeLists.txt 2013-05-27 02:25:44 UTC (rev 1825)
@@ -39,4 +39,7 @@
ADD_CHECKER_TEST(sctime "Time Race" race_pos28.mpr 1)
ADD_CHECKER_TEST(sctime "Time Race" race_cond_pos1.mpr 1)
+ADD_CHECKER_TEST(sctime "Time Race" race_cond_pos2.mpr 1)
+ADD_CHECKER_TEST(sctime "Time Race" race_cond_pos3.mpr 1)
+ADD_CHECKER_TEST(sctime "Time Race" race_cond_neg1.mpr 0)
Added: branches/conditions/tests/time/time_race/race_cond_neg1.mpr
===================================================================
--- branches/conditions/tests/time/time_race/race_cond_neg1.mpr (rev 0)
+++ branches/conditions/tests/time/time_race/race_cond_neg1.mpr 2013-05-27 02:25:44 UTC (rev 1825)
@@ -0,0 +1,38 @@
+mscdocument impl_example3.vsd;
+msc Page_1;
+initial connect L0, L1;
+L0: reference A connect L2;
+L1: condition Y connect L3;
+L2: condition X connect L3;
+L3: connect L4, L5;
+L4: final;
+L5: condition when X connect L6;
+L6: reference B connect L7;
+L7: final;
+endmsc;
+msc A;
+inst p;
+inst q;
+inst r;
+p: instance;
+out m,0 to q;
+endinstance;
+q: instance;
+in m,0 from p;
+endinstance;
+r: instance;
+endinstance;
+endmsc;
+msc B;
+inst p;
+inst q;
+inst r;
+p: instance;
+endinstance;
+q: instance;
+in m,0 from r;
+endinstance;
+r: instance;
+out m,0 to q;
+endinstance;
+endmsc;
Added: branches/conditions/tests/time/time_race/race_cond_neg1.mpr.result
===================================================================
--- branches/conditions/tests/time/time_race/race_cond_neg1.mpr.result (rev 0)
+++ branches/conditions/tests/time/time_race/race_cond_neg1.mpr.result 2013-05-27 02:25:44 UTC (rev 1825)
@@ -0,0 +1,46 @@
+Time Race violated
+OK: race_cond_neg1 violated Time Race, should be violated
+mscdocument counter_example;
+msc Page_1;
+initial connect L0;
+/* MARKED */
+L0: reference _1_A connect L1;
+L1: condition X connect L2;
+L2: connect L3;
+L3: condition when X connect L4;
+/* MARKED */
+L4: reference _2_B connect L5;
+L5: final;
+endmsc;
+msc _1_A;
+inst p;
+inst q;
+inst r;
+p: instance;
+/* MARKED */
+out m,0 to q;
+endinstance;
+q: instance;
+/* MARKED */
+/* MARKED */
+in m,0 from p;
+endinstance;
+r: instance;
+endinstance;
+endmsc;
+msc _2_B;
+inst q;
+inst r;
+inst p;
+q: instance;
+/* MARKED */
+/* MARKED */
+in m,0 from r;
+endinstance;
+r: instance;
+/* MARKED */
+out m,0 to q;
+endinstance;
+p: instance;
+endinstance;
+endmsc;
Added: branches/conditions/tests/time/time_race/race_cond_neg1.vsd
===================================================================
(Binary files differ)
Index: branches/conditions/tests/time/time_race/race_cond_neg1.vsd
===================================================================
--- branches/conditions/tests/time/time_race/race_cond_neg1.vsd 2013-05-27 01:44:38 UTC (rev 1824)
+++ branches/conditions/tests/time/time_race/race_cond_neg1.vsd 2013-05-27 02:25:44 UTC (rev 1825)
Property changes on: branches/conditions/tests/time/time_race/race_cond_neg1.vsd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/msword
\ No newline at end of property
Added: branches/conditions/tests/time/time_race/race_cond_pos2.mpr
===================================================================
--- branches/conditions/tests/time/time_race/race_cond_pos2.mpr (rev 0)
+++ branches/conditions/tests/time/time_race/race_cond_pos2.mpr 2013-05-27 02:25:44 UTC (rev 1825)
@@ -0,0 +1,38 @@
+mscdocument impl_example2.vsd;
+msc Page_1;
+initial connect L0, L1;
+L0: reference A connect L2;
+L1: condition Y connect L3;
+L2: condition X connect L3;
+L3: connect L4, L5;
+L4: final;
+L5: condition when Y connect L6;
+L6: reference B connect L7;
+L7: final;
+endmsc;
+msc A;
+inst p;
+inst q;
+inst r;
+p: instance;
+out m,0 to q;
+endinstance;
+q: instance;
+in m,0 from p;
+endinstance;
+r: instance;
+endinstance;
+endmsc;
+msc B;
+inst p;
+inst q;
+inst r;
+p: instance;
+endinstance;
+q: instance;
+in m,0 from r;
+endinstance;
+r: instance;
+out m,0 to q;
+endinstance;
+endmsc;
Added: branches/conditions/tests/time/time_race/race_cond_pos2.vsd
===================================================================
(Binary files differ)
Index: branches/conditions/tests/time/time_race/race_cond_pos2.vsd
===================================================================
--- branches/conditions/tests/time/time_race/race_cond_pos2.vsd 2013-05-27 01:44:38 UTC (rev 1824)
+++ branches/conditions/tests/time/time_race/race_cond_pos2.vsd 2013-05-27 02:25:44 UTC (rev 1825)
Property changes on: branches/conditions/tests/time/time_race/race_cond_pos2.vsd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/msword
\ No newline at end of property
Added: branches/conditions/tests/time/time_race/race_cond_pos3.mpr
===================================================================
--- branches/conditions/tests/time/time_race/race_cond_pos3.mpr (rev 0)
+++ branches/conditions/tests/time/time_race/race_cond_pos3.mpr 2013-05-27 02:25:44 UTC (rev 1825)
@@ -0,0 +1,40 @@
+mscdocument impl_example4.vsd;
+msc Page_1;
+initial connect L0, L1;
+L0: reference A connect L2;
+L1: condition Y connect L3;
+L2: condition X connect L3;
+L3: connect L4;
+L4: condition unset X connect L5;
+L5: connect L6, L7;
+L6: final;
+L7: condition when X connect L8;
+L8: reference B connect L9;
+L9: final;
+endmsc;
+msc A;
+inst p;
+inst q;
+inst r;
+p: instance;
+out m,0 to q;
+endinstance;
+q: instance;
+in m,0 from p;
+endinstance;
+r: instance;
+endinstance;
+endmsc;
+msc B;
+inst p;
+inst q;
+inst r;
+p: instance;
+endinstance;
+q: instance;
+in m,0 from r;
+endinstance;
+r: instance;
+out m,0 to q;
+endinstance;
+endmsc;
Added: branches/conditions/tests/time/time_race/race_cond_pos3.vsd
===================================================================
(Binary files differ)
Index: branches/conditions/tests/time/time_race/race_cond_pos3.vsd
===================================================================
--- branches/conditions/tests/time/time_race/race_cond_pos3.vsd 2013-05-27 01:44:38 UTC (rev 1824)
+++ branches/conditions/tests/time/time_race/race_cond_pos3.vsd 2013-05-27 02:25:44 UTC (rev 1825)
Property changes on: branches/conditions/tests/time/time_race/race_cond_pos3.vsd
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/msword
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|