diff --git a/test/lus2lic.sum b/test/lus2lic.sum index 37211f2b296453f8d48c397af7d0977033bbda91..92d7744434428600e583c21bacb366925c34130c 100644 --- a/test/lus2lic.sum +++ b/test/lus2lic.sum @@ -1,4 +1,4 @@ -Test Run By jahier on Tue Jun 24 15:23:11 2014 +Test Run By jahier on Tue Jun 24 15:30:13 2014 Native configuration is i686-pc-linux-gnu === lus2lic tests === @@ -61,7 +61,7 @@ PASS: ./lus2lic {-ec -o /tmp/mouse2.ec should_work/mouse2.lus} PASS: ./myec2c {-o /tmp/mouse2.c /tmp/mouse2.ec} PASS: ../utils/test_lus2lic_no_node should_work/mouse2.lus PASS: ./lus2lic {-2c should_work/mouse2.lus -n mouse2} -FAIL: Check that the generated C code compiles : gcc mouse2_mouse2.c mouse2_mouse2_loop.c +PASS: gcc mouse2_mouse2.c mouse2_mouse2_loop.c PASS: ./lus2lic {-o /tmp/dep.lic should_work/dep.lus} PASS: ./lus2lic {-ec -o /tmp/dep.ec should_work/dep.lus} PASS: ./myec2c {-o /tmp/dep.c /tmp/dep.ec} @@ -1482,9 +1482,9 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman === lus2lic Summary === -# of expected passes 1285 -# of unexpected failures 127 +# of expected passes 1286 +# of unexpected failures 126 # of unexpected successes 21 # of expected failures 37 -testcase ./lus2lic.tests/non-reg.exp completed in 138 seconds +testcase ./lus2lic.tests/non-reg.exp completed in 134 seconds testcase ./lus2lic.tests/progression.exp completed in 0 seconds diff --git a/test/lus2lic.time b/test/lus2lic.time index 287b41c92884633f07dfbea608da820ad6c17ca2..4e047922dcaaf2796f59fbb605071958ed93fdb5 100644 --- a/test/lus2lic.time +++ b/test/lus2lic.time @@ -1,2 +1,2 @@ -testcase ./lus2lic.tests/non-reg.exp completed in 138 seconds +testcase ./lus2lic.tests/non-reg.exp completed in 134 seconds testcase ./lus2lic.tests/progression.exp completed in 0 seconds diff --git a/test/should_work/mouse2.lus b/test/should_work/mouse2.lus index 3a5937a36d6547be6e7c722f42b386a6ef214dc0..2c6bfb7e724673ef85daf22709ea5336135f5a4c 100644 --- a/test/should_work/mouse2.lus +++ b/test/should_work/mouse2.lus @@ -7,7 +7,7 @@ node mouse2 returns ( single: bool; - double: bool + ddouble: bool ); var clock_decount: int; @@ -15,7 +15,7 @@ var more_than_one_click: bool; let single = edge(not counting) and not (false-> pre more_than_one_click); - double = edge(not counting) and (false-> pre more_than_one_click); + ddouble = edge(not counting) and (false-> pre more_than_one_click); more_than_one_click = click and (false -> pre(counting)); counting = (clock_decount > 0); clock_decount = if click and (true -> not pre(counting)) then diff --git a/todo.org b/todo.org index 5b35d401784cf18a20394cdce7cce43047ce1479..cd665d34193434f4ccd6092da186bd717e35c0e8 100644 --- a/todo.org +++ b/todo.org @@ -51,7 +51,6 @@ http://www.di.ens.fr/~pouzet/bib/lctes12.pdf ** TODO les programmes qui ne passent pas le test: -1. file:test/should_work/mouse2.lus lus2lic -2c should_work/mouse2.lus -n mouse2 2. file:test/should_work/mappredef.lus lus2lic -2c should_work/mappredef.lus -n mappredef 3. file:test/should_work/predefOp.lus lus2lic -2c should_work/predefOp.lus -n predefOp 4. file:test/should_work/matrice2.lus lus2lic -2c should_work/matrice2.lus -n matrice2