Fix test cases that were failing for stupid reasons (typically, bad node name)

nb : #FAILS=128->90

test/lus2lic.sum

-Test Run By jahier on Fri May 10 16:53:20 2013
+Test Run By jahier on Mon May 13 08:37:27 2013
 Native configuration is i686-pc-linux-gnu
 
 		=== lus2lic tests ===
@@ -120,7 +120,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/bug2.lic should_work/bug2.lus}
 PASS: ./lus2lic {-ec -o /tmp/bug2.ec should_work/bug2.lus}
 PASS: ./ec2c {-o /tmp/bug2.c /tmp/bug2.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/bug2.lus
+PASS: ../utils/test_lus2lic_no_node should_work/bug2.lus
 PASS: ./lus2lic {-o /tmp/mm.lic should_work/mm.lus}
 PASS: ./lus2lic {-ec -o /tmp/mm.ec should_work/mm.lus}
 PASS: ./ec2c {-o /tmp/mm.c /tmp/mm.ec}
@@ -128,7 +128,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/mm.lus
 PASS: ./lus2lic {-o /tmp/yyy.lic should_work/yyy.lus}
 PASS: ./lus2lic {-ec -o /tmp/yyy.ec should_work/yyy.lus}
 PASS: ./ec2c {-o /tmp/yyy.c /tmp/yyy.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/yyy.lus
+PASS: ../utils/test_lus2lic_no_node should_work/yyy.lus
 PASS: ./lus2lic {-o /tmp/toolate.lic should_work/toolate.lus}
 PASS: ./lus2lic {-ec -o /tmp/toolate.ec should_work/toolate.lus}
 PASS: ./ec2c {-o /tmp/toolate.c /tmp/toolate.ec}
@@ -145,9 +145,8 @@ PASS: ./lus2lic {-o /tmp/predefOp.lic should_work/predefOp.lus}
 PASS: ./lus2lic {-ec -o /tmp/predefOp.ec should_work/predefOp.lus}
 PASS: ./ec2c {-o /tmp/predefOp.c /tmp/predefOp.ec}
 FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/predefOp.lus
-PASS: ./lus2lic {-o /tmp/t1.lic should_work/t1.lus}
-PASS: ./lus2lic {-ec -o /tmp/t1.ec should_work/t1.lus}
-PASS: ./ec2c {-o /tmp/t1.c /tmp/t1.ec}
+FAIL: without any option: ./lus2lic {-o /tmp/t1.lic should_work/t1.lus}
+FAIL: Generate ec code  : ./lus2lic {-ec -o /tmp/t1.ec should_work/t1.lus}
 FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/t1.lus
 PASS: ./lus2lic {-o /tmp/nc9.lic should_work/nc9.lus}
 PASS: ./lus2lic {-ec -o /tmp/nc9.ec should_work/nc9.lus}
@@ -214,7 +213,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/SWITCH.lus
 PASS: ./lus2lic {-o /tmp/cst.lic should_work/cst.lus}
 PASS: ./lus2lic {-ec -o /tmp/cst.ec should_work/cst.lus}
 PASS: ./ec2c {-o /tmp/cst.c /tmp/cst.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/cst.lus
+PASS: ../utils/test_lus2lic_no_node should_work/cst.lus
 PASS: ./lus2lic {-o /tmp/minmax5_random.lic should_work/minmax5_random.lus}
 PASS: ./lus2lic {-ec -o /tmp/minmax5_random.ec should_work/minmax5_random.lus}
 PASS: ./ec2c {-o /tmp/minmax5_random.c /tmp/minmax5_random.ec}
@@ -230,7 +229,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/v1.lus
 PASS: ./lus2lic {-o /tmp/ply02.lic should_work/ply02.lus}
 PASS: ./lus2lic {-ec -o /tmp/ply02.ec should_work/ply02.lus}
 PASS: ./ec2c {-o /tmp/ply02.c /tmp/ply02.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/ply02.lus
+PASS: ../utils/test_lus2lic_no_node should_work/ply02.lus
 PASS: ./lus2lic {-o /tmp/call04.lic should_work/call04.lus}
 PASS: ./lus2lic {-ec -o /tmp/call04.ec should_work/call04.lus}
 PASS: ./ec2c {-o /tmp/call04.c /tmp/call04.ec}
@@ -242,7 +241,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/bascule.lus
 PASS: ./lus2lic {-o /tmp/struct_with.lic should_work/struct_with.lus}
 PASS: ./lus2lic {-ec -o /tmp/struct_with.ec should_work/struct_with.lus}
 PASS: ./ec2c {-o /tmp/struct_with.c /tmp/struct_with.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/struct_with.lus
+PASS: ../utils/test_lus2lic_no_node should_work/struct_with.lus
 PASS: ./lus2lic {-o /tmp/test_node_expand.lic should_work/test_node_expand.lus}
 PASS: ./lus2lic {-ec -o /tmp/test_node_expand.ec should_work/test_node_expand.lus}
 PASS: ./ec2c {-o /tmp/test_node_expand.c /tmp/test_node_expand.ec}
@@ -282,7 +281,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/zzz2.lic should_work/zzz2.lus}
 PASS: ./lus2lic {-ec -o /tmp/zzz2.ec should_work/zzz2.lus}
 PASS: ./ec2c {-o /tmp/zzz2.c /tmp/zzz2.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/zzz2.lus
+PASS: ../utils/test_lus2lic_no_node should_work/zzz2.lus
 PASS: ./lus2lic {-o /tmp/polymorphic_pack.lic should_work/polymorphic_pack.lus}
 PASS: ./lus2lic {-ec -o /tmp/polymorphic_pack.ec should_work/polymorphic_pack.lus}
 PASS: ./ec2c {-o /tmp/polymorphic_pack.c /tmp/polymorphic_pack.ec}
@@ -306,7 +305,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/ec.lic should_work/ec.lus}
 PASS: ./lus2lic {-ec -o /tmp/ec.ec should_work/ec.lus}
 PASS: ./ec2c {-o /tmp/ec.c /tmp/ec.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/ec.lus
+PASS: ../utils/test_lus2lic_no_node should_work/ec.lus
 PASS: ./lus2lic {-o /tmp/morel3.lic should_work/morel3.lus}
 PASS: ./lus2lic {-ec -o /tmp/morel3.ec should_work/morel3.lus}
 PASS: ./ec2c {-o /tmp/morel3.c /tmp/morel3.ec}
@@ -314,15 +313,15 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/fresh_name.lic should_work/fresh_name.lus}
 PASS: ./lus2lic {-ec -o /tmp/fresh_name.ec should_work/fresh_name.lus}
 PASS: ./ec2c {-o /tmp/fresh_name.c /tmp/fresh_name.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/fresh_name.lus
+PASS: ../utils/test_lus2lic_no_node should_work/fresh_name.lus
 PASS: ./lus2lic {-o /tmp/ply03.lic should_work/ply03.lus}
 PASS: ./lus2lic {-ec -o /tmp/ply03.ec should_work/ply03.lus}
 PASS: ./ec2c {-o /tmp/ply03.c /tmp/ply03.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/ply03.lus
+PASS: ../utils/test_lus2lic_no_node should_work/ply03.lus
 PASS: ./lus2lic {-o /tmp/param_struct.lic should_work/param_struct.lus}
 PASS: ./lus2lic {-ec -o /tmp/param_struct.ec should_work/param_struct.lus}
 PASS: ./ec2c {-o /tmp/param_struct.c /tmp/param_struct.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/param_struct.lus
+PASS: ../utils/test_lus2lic_no_node should_work/param_struct.lus
 PASS: ./lus2lic {-o /tmp/minmax2.lic should_work/minmax2.lus}
 PASS: ./lus2lic {-ec -o /tmp/minmax2.ec should_work/minmax2.lus}
 PASS: ./ec2c {-o /tmp/minmax2.c /tmp/minmax2.ec}
@@ -334,7 +333,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/xx.lic should_work/xx.lus}
 PASS: ./lus2lic {-ec -o /tmp/xx.ec should_work/xx.lus}
 PASS: ./ec2c {-o /tmp/xx.c /tmp/xx.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/xx.lus
+PASS: ../utils/test_lus2lic_no_node should_work/xx.lus
 PASS: ./lus2lic {-o /tmp/call07.lic should_work/call07.lus}
 PASS: ./lus2lic {-ec -o /tmp/call07.ec should_work/call07.lus}
 PASS: ./ec2c {-o /tmp/call07.c /tmp/call07.ec}
@@ -342,7 +341,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/shift_ludic.lic should_work/shift_ludic.lus}
 PASS: ./lus2lic {-ec -o /tmp/shift_ludic.ec should_work/shift_ludic.lus}
 PASS: ./ec2c {-o /tmp/shift_ludic.c /tmp/shift_ludic.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/shift_ludic.lus
+PASS: ../utils/test_lus2lic_no_node should_work/shift_ludic.lus
 PASS: ./lus2lic {-o /tmp/pilote-1.0.lic should_work/pilote-1.0.lus}
 PASS: ./lus2lic {-ec -o /tmp/pilote-1.0.ec should_work/pilote-1.0.lus}
 PASS: ./ec2c {-o /tmp/pilote-1.0.c /tmp/pilote-1.0.ec}
@@ -374,7 +373,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/tri.lic should_work/tri.lus}
 PASS: ./lus2lic {-ec -o /tmp/tri.ec should_work/tri.lus}
 PASS: ./ec2c {-o /tmp/tri.c /tmp/tri.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/tri.lus
+PASS: ../utils/test_lus2lic_no_node should_work/tri.lus
 PASS: ./lus2lic {-o /tmp/calculs_max.lic should_work/calculs_max.lus}
 PASS: ./lus2lic {-ec -o /tmp/calculs_max.ec should_work/calculs_max.lus}
 PASS: ./ec2c {-o /tmp/calculs_max.c /tmp/calculs_max.ec}
@@ -398,14 +397,10 @@ PASS: ./lus2lic {-o /tmp/morel4.lic should_work/morel4.lus}
 PASS: ./lus2lic {-ec -o /tmp/morel4.ec should_work/morel4.lus}
 PASS: ./ec2c {-o /tmp/morel4.c /tmp/morel4.ec}
 FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/morel4.lus
-PASS: ./lus2lic {-o /tmp/enum.lic should_work/enum.lus}
-PASS: ./lus2lic {-ec -o /tmp/enum.ec should_work/enum.lus}
-PASS: ./ec2c {-o /tmp/enum.c /tmp/enum.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/enum.lus
 PASS: ./lus2lic {-o /tmp/param_node4.lic should_work/param_node4.lus}
 PASS: ./lus2lic {-ec -o /tmp/param_node4.ec should_work/param_node4.lus}
 PASS: ./ec2c {-o /tmp/param_node4.c /tmp/param_node4.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/param_node4.lus
+PASS: ../utils/test_lus2lic_no_node should_work/param_node4.lus
 PASS: ./lus2lic {-o /tmp/bad_call03.lic should_work/bad_call03.lus}
 PASS: ./lus2lic {-ec -o /tmp/bad_call03.ec should_work/bad_call03.lus}
 PASS: ./ec2c {-o /tmp/bad_call03.c /tmp/bad_call03.ec}
@@ -429,7 +424,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/mouse.lus
 PASS: ./lus2lic {-o /tmp/param_node3.lic should_work/param_node3.lus}
 PASS: ./lus2lic {-ec -o /tmp/param_node3.ec should_work/param_node3.lus}
 PASS: ./ec2c {-o /tmp/param_node3.c /tmp/param_node3.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/param_node3.lus
+PASS: ../utils/test_lus2lic_no_node should_work/param_node3.lus
 PASS: ./lus2lic {-o /tmp/pipeline.lic should_work/pipeline.lus}
 PASS: ./lus2lic {-ec -o /tmp/pipeline.ec should_work/pipeline.lus}
 PASS: ./ec2c {-o /tmp/pipeline.c /tmp/pipeline.ec}
@@ -453,11 +448,11 @@ PASS: ../utils/test_lus2lic_no_node should_work/mm3.lus
 PASS: ./lus2lic {-o /tmp/over2.lic should_work/over2.lus}
 PASS: ./lus2lic {-ec -o /tmp/over2.ec should_work/over2.lus}
 PASS: ./ec2c {-o /tmp/over2.c /tmp/over2.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/over2.lus
+UNRESOLVED: Time out: ../utils/test_lus2lic_no_node should_work/over2.lus
 PASS: ./lus2lic {-o /tmp/over3.lic should_work/over3.lus}
 PASS: ./lus2lic {-ec -o /tmp/over3.ec should_work/over3.lus}
 PASS: ./ec2c {-o /tmp/over3.c /tmp/over3.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/over3.lus
+PASS: ../utils/test_lus2lic_no_node should_work/over3.lus
 PASS: ./lus2lic {-o /tmp/complex.lic should_work/complex.lus}
 PASS: ./lus2lic {-ec -o /tmp/complex.ec should_work/complex.lus}
 PASS: ./ec2c {-o /tmp/complex.c /tmp/complex.ec}
@@ -477,7 +472,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/TIME_STABLE1.lic should_work/TIME_STABLE1.lus}
 PASS: ./lus2lic {-ec -o /tmp/TIME_STABLE1.ec should_work/TIME_STABLE1.lus}
 PASS: ./ec2c {-o /tmp/TIME_STABLE1.c /tmp/TIME_STABLE1.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/TIME_STABLE1.lus
+PASS: ../utils/test_lus2lic_no_node should_work/TIME_STABLE1.lus
 PASS: ./lus2lic {-o /tmp/nc5.lic should_work/nc5.lus}
 PASS: ./lus2lic {-ec -o /tmp/nc5.ec should_work/nc5.lus}
 PASS: ./ec2c {-o /tmp/nc5.c /tmp/nc5.ec}
@@ -511,7 +506,7 @@ PASS: ./ec2c {-o /tmp/arbitre.c /tmp/arbitre.ec}
 PASS: ./lus2lic {-o /tmp/test_const.lic should_work/test_const.lus}
 PASS: ./lus2lic {-ec -o /tmp/test_const.ec should_work/test_const.lus}
 PASS: ./ec2c {-o /tmp/test_const.c /tmp/test_const.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/test_const.lus
+PASS: ../utils/test_lus2lic_no_node should_work/test_const.lus
 PASS: ./lus2lic {-o /tmp/when_tuple.lic should_work/when_tuple.lus}
 PASS: ./lus2lic {-ec -o /tmp/when_tuple.ec should_work/when_tuple.lus}
 PASS: ./ec2c {-o /tmp/when_tuple.c /tmp/when_tuple.ec}
@@ -519,6 +514,10 @@ PASS: ./lus2lic {-o /tmp/carV2.lic should_work/carV2.lus}
 PASS: ./lus2lic {-ec -o /tmp/carV2.ec should_work/carV2.lus}
 PASS: ./ec2c {-o /tmp/carV2.c /tmp/carV2.ec}
 PASS: ../utils/test_lus2lic_no_node should_work/carV2.lus
+PASS: ./lus2lic {-o /tmp/test_merge.lic should_work/test_merge.lus}
+PASS: ./lus2lic {-ec -o /tmp/test_merge.ec should_work/test_merge.lus}
+PASS: ./ec2c {-o /tmp/test_merge.c /tmp/test_merge.ec}
+FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/test_merge.lus
 PASS: ./lus2lic {-o /tmp/FillFollowedByRed.lic should_work/FillFollowedByRed.lus}
 PASS: ./lus2lic {-ec -o /tmp/FillFollowedByRed.ec should_work/FillFollowedByRed.lus}
 PASS: ./ec2c {-o /tmp/FillFollowedByRed.c /tmp/FillFollowedByRed.ec}
@@ -527,10 +526,14 @@ PASS: ./lus2lic {-o /tmp/sample_time_change.lic should_work/sample_time_change.l
 PASS: ./lus2lic {-ec -o /tmp/sample_time_change.ec should_work/sample_time_change.lus}
 PASS: ./ec2c {-o /tmp/sample_time_change.c /tmp/sample_time_change.ec}
 FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/sample_time_change.lus
+PASS: ./lus2lic {-o /tmp/test_enum.lic should_work/test_enum.lus}
+PASS: ./lus2lic {-ec -o /tmp/test_enum.ec should_work/test_enum.lus}
+PASS: ./ec2c {-o /tmp/test_enum.c /tmp/test_enum.ec}
+PASS: ../utils/test_lus2lic_no_node should_work/test_enum.lus
 PASS: ./lus2lic {-o /tmp/predef01.lic should_work/predef01.lus}
 PASS: ./lus2lic {-ec -o /tmp/predef01.ec should_work/predef01.lus}
 PASS: ./ec2c {-o /tmp/predef01.c /tmp/predef01.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/predef01.lus
+PASS: ../utils/test_lus2lic_no_node should_work/predef01.lus
 PASS: ./lus2lic {-o /tmp/long_et_stupide_nom_de_noeud.lic should_work/long_et_stupide_nom_de_noeud.lus}
 PASS: ./lus2lic {-ec -o /tmp/long_et_stupide_nom_de_noeud.ec should_work/long_et_stupide_nom_de_noeud.lus}
 PASS: ./ec2c {-o /tmp/long_et_stupide_nom_de_noeud.c /tmp/long_et_stupide_nom_de_noeud.ec}
@@ -542,11 +545,11 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/left.lic should_work/left.lus}
 PASS: ./lus2lic {-ec -o /tmp/left.ec should_work/left.lus}
 PASS: ./ec2c {-o /tmp/left.c /tmp/left.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/left.lus
+PASS: ../utils/test_lus2lic_no_node should_work/left.lus
 PASS: ./lus2lic {-o /tmp/ts04.lic should_work/ts04.lus}
 PASS: ./lus2lic {-ec -o /tmp/ts04.ec should_work/ts04.lus}
 PASS: ./ec2c {-o /tmp/ts04.c /tmp/ts04.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/ts04.lus
+PASS: ../utils/test_lus2lic_no_node should_work/ts04.lus
 FAIL: without any option: ./lus2lic {-o /tmp/bug_map_fby.lic should_work/bug_map_fby.lus}
 FAIL: Generate ec code  : ./lus2lic {-ec -o /tmp/bug_map_fby.ec should_work/bug_map_fby.lus}
 PASS: ./lus2lic {-o /tmp/multiclock.lic should_work/multiclock.lus}
@@ -600,7 +603,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/activation_ec.lus
 PASS: ./lus2lic {-o /tmp/impl_priority.lic should_work/impl_priority.lus}
 PASS: ./lus2lic {-ec -o /tmp/impl_priority.ec should_work/impl_priority.lus}
 PASS: ./ec2c {-o /tmp/impl_priority.c /tmp/impl_priority.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/impl_priority.lus
+PASS: ../utils/test_lus2lic_no_node should_work/impl_priority.lus
 PASS: ./lus2lic {-o /tmp/exclusion.lic should_work/exclusion.lus}
 PASS: ./lus2lic {-ec -o /tmp/exclusion.ec should_work/exclusion.lus}
 PASS: ./ec2c {-o /tmp/exclusion.c /tmp/exclusion.ec}
@@ -612,7 +615,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/consensus.lic should_work/consensus.lus}
 PASS: ./lus2lic {-ec -o /tmp/consensus.ec should_work/consensus.lus}
 PASS: ./ec2c {-o /tmp/consensus.c /tmp/consensus.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/consensus.lus
+PASS: ../utils/test_lus2lic_no_node should_work/consensus.lus
 PASS: ./lus2lic {-o /tmp/activation2.lic should_work/activation2.lus}
 PASS: ./lus2lic {-ec -o /tmp/activation2.ec should_work/activation2.lus}
 PASS: ./ec2c {-o /tmp/activation2.c /tmp/activation2.ec}
@@ -620,7 +623,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/type_decl.lic should_work/type_decl.lus}
 PASS: ./lus2lic {-ec -o /tmp/type_decl.ec should_work/type_decl.lus}
 PASS: ./ec2c {-o /tmp/type_decl.c /tmp/type_decl.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/type_decl.lus
+PASS: ../utils/test_lus2lic_no_node should_work/type_decl.lus
 PASS: ./lus2lic {-o /tmp/import1.lic should_work/import1.lus}
 PASS: ./lus2lic {-ec -o /tmp/import1.ec should_work/import1.lus}
 PASS: ./ec2c {-o /tmp/import1.c /tmp/import1.ec}
@@ -637,18 +640,18 @@ PASS: ./lus2lic {-o /tmp/notTwo.lic should_work/notTwo.lus}
 PASS: ./lus2lic {-ec -o /tmp/notTwo.ec should_work/notTwo.lus}
 PASS: ./ec2c {-o /tmp/notTwo.c /tmp/notTwo.ec}
 PASS: ../utils/test_lus2lic_no_node should_work/notTwo.lus
-PASS: ./lus2lic {-o /tmp/struct.lic should_work/struct.lus}
-PASS: ./lus2lic {-ec -o /tmp/struct.ec should_work/struct.lus}
-PASS: ./ec2c {-o /tmp/struct.c /tmp/struct.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/struct.lus
 PASS: ./lus2lic {-o /tmp/stopwatch.lic should_work/stopwatch.lus}
 PASS: ./lus2lic {-ec -o /tmp/stopwatch.ec should_work/stopwatch.lus}
 PASS: ./ec2c {-o /tmp/stopwatch.c /tmp/stopwatch.ec}
 PASS: ../utils/test_lus2lic_no_node should_work/stopwatch.lus
+PASS: ./lus2lic {-o /tmp/test_condact.lic should_work/test_condact.lus}
+PASS: ./lus2lic {-ec -o /tmp/test_condact.ec should_work/test_condact.lus}
+PASS: ./ec2c {-o /tmp/test_condact.c /tmp/test_condact.ec}
+FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/test_condact.lus
 PASS: ./lus2lic {-o /tmp/contractForElementSelectionInArray.lic should_work/contractForElementSelectionInArray.lus}
 PASS: ./lus2lic {-ec -o /tmp/contractForElementSelectionInArray.ec should_work/contractForElementSelectionInArray.lus}
 PASS: ./ec2c {-o /tmp/contractForElementSelectionInArray.c /tmp/contractForElementSelectionInArray.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/contractForElementSelectionInArray.lus
+PASS: ../utils/test_lus2lic_no_node should_work/contractForElementSelectionInArray.lus
 PASS: ./lus2lic {-o /tmp/iterFibo.lic should_work/iterFibo.lus}
 PASS: ./lus2lic {-ec -o /tmp/iterFibo.ec should_work/iterFibo.lus}
 PASS: ./ec2c {-o /tmp/iterFibo.c /tmp/iterFibo.ec}
@@ -664,7 +667,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/minmax1.lus
 PASS: ./lus2lic {-o /tmp/aa.lic should_work/aa.lus}
 PASS: ./lus2lic {-ec -o /tmp/aa.ec should_work/aa.lus}
 PASS: ./ec2c {-o /tmp/aa.c /tmp/aa.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/aa.lus
+PASS: ../utils/test_lus2lic_no_node should_work/aa.lus
 PASS: ./lus2lic {-o /tmp/mouse3.lic should_work/mouse3.lus}
 PASS: ./lus2lic {-ec -o /tmp/mouse3.ec should_work/mouse3.lus}
 PASS: ./ec2c {-o /tmp/mouse3.c /tmp/mouse3.ec}
@@ -676,7 +679,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/ex.lus
 PASS: ./lus2lic {-o /tmp/xxx.lic should_work/xxx.lus}
 PASS: ./lus2lic {-ec -o /tmp/xxx.ec should_work/xxx.lus}
 PASS: ./ec2c {-o /tmp/xxx.c /tmp/xxx.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/xxx.lus
+PASS: ../utils/test_lus2lic_no_node should_work/xxx.lus
 PASS: ./lus2lic {-o /tmp/aux1.lic should_work/aux1.lus}
 PASS: ./lus2lic {-ec -o /tmp/aux1.ec should_work/aux1.lus}
 PASS: ./ec2c {-o /tmp/aux1.c /tmp/aux1.ec}
@@ -700,7 +703,7 @@ UNRESOLVED: Time out: ../utils/test_lus2lic_no_node should_work/lecteur.lus
 PASS: ./lus2lic {-o /tmp/bug.lic should_work/bug.lus}
 PASS: ./lus2lic {-ec -o /tmp/bug.ec should_work/bug.lus}
 PASS: ./ec2c {-o /tmp/bug.c /tmp/bug.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/bug.lus
+PASS: ../utils/test_lus2lic_no_node should_work/bug.lus
 PASS: ./lus2lic {-o /tmp/ck4.lic should_work/ck4.lus}
 PASS: ./lus2lic {-ec -o /tmp/ck4.ec should_work/ck4.lus}
 PASS: ./ec2c {-o /tmp/ck4.c /tmp/ck4.ec}
@@ -716,7 +719,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/struct0.lic should_work/struct0.lus}
 PASS: ./lus2lic {-ec -o /tmp/struct0.ec should_work/struct0.lus}
 PASS: ./ec2c {-o /tmp/struct0.c /tmp/struct0.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/struct0.lus
+PASS: ../utils/test_lus2lic_no_node should_work/struct0.lus
 PASS: ./lus2lic {-o /tmp/filliter.lic should_work/filliter.lus}
 PASS: ./lus2lic {-ec -o /tmp/filliter.ec should_work/filliter.lus}
 PASS: ./ec2c {-o /tmp/filliter.c /tmp/filliter.ec}
@@ -728,7 +731,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/minmax4.lus
 PASS: ./lus2lic {-o /tmp/nested.lic should_work/nested.lus}
 PASS: ./lus2lic {-ec -o /tmp/nested.ec should_work/nested.lus}
 PASS: ./ec2c {-o /tmp/nested.c /tmp/nested.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/nested.lus
+UNRESOLVED: Time out: ../utils/test_lus2lic_no_node should_work/nested.lus
 PASS: ./lus2lic {-o /tmp/Gyroscope.lic should_work/Gyroscope.lus}
 PASS: ./lus2lic {-ec -o /tmp/Gyroscope.ec should_work/Gyroscope.lus}
 PASS: ./ec2c {-o /tmp/Gyroscope.c /tmp/Gyroscope.ec}
@@ -761,6 +764,10 @@ PASS: ./lus2lic {-o /tmp/minmax4_bis.lic should_work/minmax4_bis.lus}
 PASS: ./lus2lic {-ec -o /tmp/minmax4_bis.ec should_work/minmax4_bis.lus}
 PASS: ./ec2c {-o /tmp/minmax4_bis.c /tmp/minmax4_bis.ec}
 PASS: ../utils/test_lus2lic_no_node should_work/minmax4_bis.lus
+PASS: ./lus2lic {-o /tmp/test_struct.lic should_work/test_struct.lus}
+PASS: ./lus2lic {-ec -o /tmp/test_struct.ec should_work/test_struct.lus}
+PASS: ./ec2c {-o /tmp/test_struct.c /tmp/test_struct.ec}
+PASS: ../utils/test_lus2lic_no_node should_work/test_struct.lus
 PASS: ./lus2lic {-o /tmp/uu.lic should_work/uu.lus}
 PASS: ./lus2lic {-ec -o /tmp/uu.ec should_work/uu.lus}
 PASS: ./ec2c {-o /tmp/uu.c /tmp/uu.ec}
@@ -784,7 +791,7 @@ PASS: ../utils/test_lus2lic_no_node should_work/pre_x.lus
 PASS: ./lus2lic {-o /tmp/ts01.lic should_work/ts01.lus}
 PASS: ./lus2lic {-ec -o /tmp/ts01.ec should_work/ts01.lus}
 PASS: ./ec2c {-o /tmp/ts01.c /tmp/ts01.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/ts01.lus
+PASS: ../utils/test_lus2lic_no_node should_work/ts01.lus
 PASS: ./lus2lic {-o /tmp/_N_uu.lic should_work/_N_uu.lus}
 PASS: ./lus2lic {-ec -o /tmp/_N_uu.ec should_work/_N_uu.lus}
 PASS: ./ec2c {-o /tmp/_N_uu.c /tmp/_N_uu.ec}
@@ -812,11 +819,11 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/predef02.lic should_work/predef02.lus}
 PASS: ./lus2lic {-ec -o /tmp/predef02.ec should_work/predef02.lus}
 PASS: ./ec2c {-o /tmp/predef02.c /tmp/predef02.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/predef02.lus
+PASS: ../utils/test_lus2lic_no_node should_work/predef02.lus
 PASS: ./lus2lic {-o /tmp/toto.lic should_work/toto.lus}
 PASS: ./lus2lic {-ec -o /tmp/toto.ec should_work/toto.lus}
 PASS: ./ec2c {-o /tmp/toto.c /tmp/toto.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/toto.lus
+PASS: ../utils/test_lus2lic_no_node should_work/toto.lus
 PASS: ./lus2lic {-o /tmp/minmax6.lic should_work/minmax6.lus}
 PASS: ./lus2lic {-ec -o /tmp/minmax6.ec should_work/minmax6.lus}
 PASS: ./ec2c {-o /tmp/minmax6.c /tmp/minmax6.ec}
@@ -828,7 +835,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/zzz.lic should_work/zzz.lus}
 PASS: ./lus2lic {-ec -o /tmp/zzz.ec should_work/zzz.lus}
 PASS: ./ec2c {-o /tmp/zzz.c /tmp/zzz.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/zzz.lus
+PASS: ../utils/test_lus2lic_no_node should_work/zzz.lus
 PASS: ./lus2lic {-o /tmp/STABLE.lic should_work/STABLE.lus}
 PASS: ./lus2lic {-ec -o /tmp/STABLE.ec should_work/STABLE.lus}
 PASS: ./ec2c {-o /tmp/STABLE.c /tmp/STABLE.ec}
@@ -840,7 +847,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/tuple.lic should_work/tuple.lus}
 PASS: ./lus2lic {-ec -o /tmp/tuple.ec should_work/tuple.lus}
 PASS: ./ec2c {-o /tmp/tuple.c /tmp/tuple.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/tuple.lus
+PASS: ../utils/test_lus2lic_no_node should_work/tuple.lus
 PASS: ./lus2lic {-o /tmp/call02.lic should_work/call02.lus}
 PASS: ./lus2lic {-ec -o /tmp/call02.ec should_work/call02.lus}
 PASS: ./ec2c {-o /tmp/call02.c /tmp/call02.ec}
@@ -869,10 +876,6 @@ PASS: ./lus2lic {-o /tmp/flo.lic should_work/flo.lus}
 PASS: ./lus2lic {-ec -o /tmp/flo.ec should_work/flo.lus}
 PASS: ./ec2c {-o /tmp/flo.c /tmp/flo.ec}
 PASS: ../utils/test_lus2lic_no_node should_work/flo.lus
-PASS: ./lus2lic {-o /tmp/condact.lic should_work/condact.lus}
-PASS: ./lus2lic {-ec -o /tmp/condact.ec should_work/condact.lus}
-PASS: ./ec2c {-o /tmp/condact.c /tmp/condact.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/condact.lus
 PASS: ./lus2lic {-o /tmp/cond01.lic should_work/cond01.lus}
 PASS: ./lus2lic {-ec -o /tmp/cond01.ec should_work/cond01.lus}
 PASS: ./ec2c {-o /tmp/cond01.c /tmp/cond01.ec}
@@ -880,7 +883,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/shiftFill_ludic.lic should_work/shiftFill_ludic.lus}
 PASS: ./lus2lic {-ec -o /tmp/shiftFill_ludic.ec should_work/shiftFill_ludic.lus}
 PASS: ./ec2c {-o /tmp/shiftFill_ludic.c /tmp/shiftFill_ludic.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/shiftFill_ludic.lus
+PASS: ../utils/test_lus2lic_no_node should_work/shiftFill_ludic.lus
 PASS: ./lus2lic {-o /tmp/after.lic should_work/after.lus}
 PASS: ./lus2lic {-ec -o /tmp/after.ec should_work/after.lus}
 PASS: ./ec2c {-o /tmp/after.c /tmp/after.ec}
@@ -949,10 +952,6 @@ PASS: ./lus2lic {-o /tmp/clock1_2ms.lic should_work/clock1_2ms.lus}
 PASS: ./lus2lic {-ec -o /tmp/clock1_2ms.ec should_work/clock1_2ms.lus}
 PASS: ./ec2c {-o /tmp/clock1_2ms.c /tmp/clock1_2ms.ec}
 FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/clock1_2ms.lus
-PASS: ./lus2lic {-o /tmp/merge.lic should_work/merge.lus}
-PASS: ./lus2lic {-ec -o /tmp/merge.ec should_work/merge.lus}
-PASS: ./ec2c {-o /tmp/merge.c /tmp/merge.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/merge.lus
 PASS: ./lus2lic {-o /tmp/decl.lic should_work/decl.lus}
 PASS: ./lus2lic {-ec -o /tmp/decl.ec should_work/decl.lus}
 PASS: ./ec2c {-o /tmp/decl.c /tmp/decl.ec}
@@ -976,7 +975,7 @@ FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node shou
 PASS: ./lus2lic {-o /tmp/func_with_body.lic should_work/func_with_body.lus}
 PASS: ./lus2lic {-ec -o /tmp/func_with_body.ec should_work/func_with_body.lus}
 PASS: ./ec2c {-o /tmp/func_with_body.c /tmp/func_with_body.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/func_with_body.lus
+PASS: ../utils/test_lus2lic_no_node should_work/func_with_body.lus
 PASS: ./lus2lic {-o /tmp/minus.lic should_work/minus.lus}
 PASS: ./lus2lic {-ec -o /tmp/minus.ec should_work/minus.lus}
 PASS: ./ec2c {-o /tmp/minus.c /tmp/minus.ec}
@@ -1045,8 +1044,8 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman
 
 		=== lus2lic Summary ===
 
-# of expected passes		835
-# of unexpected failures	128
+# of expected passes		870
+# of unexpected failures	90
 # of unexpected successes	11
 # of expected failures		37
-# of unresolved testcases	22
+# of unresolved testcases	24

test/lus2lic.time

-testcase ./lus2lic.tests/non-reg.exp completed in 223 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 333 seconds
 testcase ./lus2lic.tests/progression.exp completed in 0 seconds

test/should_work/TIME_STABLE1.lus

-node TIME1_STABLE1(set,second:bool; delay:int) returns (level:bool);
+
+
+node TIME_STABLE1(set,second:bool; delay:int) returns (level:bool);
 var count: int;
 let
   level = (count > 0);

test/should_work/aa.lus

@@ -8,7 +8,7 @@ let
    _acc1 = Lustre::plus(i1, i2_0);
 tel
 -- end of node n_node_alias
-node matrice2(a:int) returns (res:int);
+node aa(a:int) returns (res:int);
 var
    _acc1:int;
    _v1_0:int;

test/should_work/bred_lv4.lus

@@ -15,7 +15,7 @@ type T1_ARRAY = bool^2;
 -------------------------------------------- 
 -- operator definition 
 -------------------------------------------- 
-node bred(
+node bred_lv4(
  i_a : T1_ARRAY;
  ) returns ( 
  o_x : bool;

test/should_work/bug.lus

@@ -9,7 +9,7 @@ let
   o = x^3;
 tel
 
-node simple2(x:s) returns (o: s^3^2; i: int);
+node bug(x:s) returns (o: s^3^2; i: int);
 let 
   o[0] = simple(x);
   o[1] = simple(x);

test/should_work/bug2.lus

@@ -5,7 +5,7 @@
 
 type s =  { f1: int ; f2: int^2 };
 
-node simple(x:s) returns (i: s^2);
+node bug2(x:s) returns (i: s^2);
 let 
 
   i = s { f1 = 42; f2 = [5, 6] } ^ 2;

test/should_work/clock_ite.lus

 
 
-node clock(a: bool; b: bool) returns (c: bool when a);
+node clock_ite(a: bool; b: bool) returns (c: bool when a);
 -- var
 --  z: bool;
 

test/should_work/cond01.lus

 
 
-node main(c: bool; x,y:int) returns (o: int);
+node cond01(c: bool; x,y:int) returns (o: int);
 let
 	o = condact<<+,0>>(c,x,y);
 tel

test/should_work/consensus.lus

@@ -17,13 +17,14 @@ let
 	a = T[0] and consensus<<n-1>>(T[1..n-1]);
 tel
 *)
-node consensus<<const n : int>>(T: bool^n) returns (a: bool); 
+node consensus_gen<<const n : int>>(T: bool^n) returns (a: bool); 
 let
 	a = with (n = 1)
 		then T[0]
-		else T[0] and consensus << n-1 >> (T[1 .. n-1]);
+		else T[0] and consensus_gen << n-1 >> (T[1 .. n-1]);
 tel
 
+node consensus = consensus_gen<<8>>
 (*
 node consensus(T: bool list) returns (a: bool); 
 let
@@ -32,7 +33,7 @@ let
 tel
 *)
 
-node c8 = consensus<<8>>;
+node c8 = consensus_gen<<8>>;
 
 
 
@@ -40,7 +41,7 @@ node c8 = consensus<<8>>;
 
 node main (T : bool^4) returns (c : bool);
 let
-	c = consensus<<4>>(T);
+	c = consensus_gen<<4>>(T);
 tel
 
-node main2 = consensus<<10>>;
+node main2 = consensus_gen<<10>>;

test/should_work/contractForElementSelectionInArray.lus

@@ -33,3 +33,5 @@ let
                                      else acc_in.elementSelected
                    };
 tel
+
+node contractForElementSelectionInArray = selectOneStage
\ No newline at end of file

test/should_work/cst.lus

-const i, j, k: int;
+const i=3;
+const j=3;
+const k=3;
 
 node cst(x:int) returns (y:int);
 var z,t: int;

test/should_work/ec.lus

 
-node left__toto(
+node ec(
 	x:bool) 
 returns (
 	t_0_a_0:bool;

test/should_work/fresh_name.lus

@@ -9,8 +9,7 @@ let
 	n1s = (n1b1 or n1b2);				
 tel
 
-
-node fn (b:bool) returns (res:bool);
+node fresh_name (b:bool) returns (res:bool);
 var _n1e1_1:bool;
 let
   _n1e1_1 = not b;

test/should_work/func_with_body.lus

 -- an intern function
-function trivial(x : int) returns (y : int);
+function func_with_body(x : int) returns (y : int);
 let
 	y = 1;
 tel
@@ -8,5 +8,3 @@ tel
 -- and an extern node
 extern node ext(x : int) returns (y : int);
 
-
-

test/should_work/impl_priority.lus

-node test_impl_prio(x: int) returns (ok: bool)
+
+node impl_priority(x: int) returns (ok: bool)
 let
   ok = x=1 => true;
 tel

test/should_work/is_stable.lus

@@ -88,4 +88,6 @@ let
 tel
 
 node maxr=max<<real>>;
-node minr=min<<real>>;
\ No newline at end of file
+node minr=min<<real>>;
+
+node is_stable = is_d_stable<<5, 0.1>>
\ No newline at end of file

test/should_work/left.lus

@@ -5,7 +5,7 @@ type truc = struct {
 };
 
 
-node toto(x : bool) returns (t : truc^3);
+node left(x : bool) returns (t : truc^3);
 let
         t[0].a[0..98 step 2][48..0 step -2] = true^25;	
 --      t[0].a[0..98 step 2][0..48 step 2] = true^25;	

test/should_work/map.lus

@@ -12,7 +12,7 @@ let
 	(* o = titi<<int>>(x,y); *)
 tel
 
-node tutu(x,y: real^4) returns (o: real^4);
+node map(x,y: real^4) returns (o: real^4);
 let
 	o = titi<<real>>(x,y);
 tel

test/should_work/multipar.lus

@@ -4,7 +4,7 @@
 
 node gup(x: int) returns (y:int);
 let
-   y = 2 * sil<< lis_bok >>(x);
+   y = 2 * sil<< multipar >>(x);
 tel
 
 node bok(x:int)returns(y:int);
@@ -22,6 +22,4 @@ let
    y = x * g(x);
 tel
 
-node lis_bok = lis <<bok>>;
-
-
+node multipar = lis <<bok>>;