From aa279047db7025b98ec252487fc2b08b816e4baf Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Tue, 3 Mar 2020 17:16:14 +0100
Subject: [PATCH] Update: raise an (explicit) error if no node is provided in
 -2c or -exec mode

---
 lib/lv6MainArgs.ml                           |   10 +-
 test/lus2lic.sum                             | 1100 +++++++++---------
 test/lus2lic.tests/non-reg.exp               |    6 +-
 test/lus2lic.tests/progression.exp           |    8 +-
 test/should_work/cond01.lus                  |    2 +-
 test/should_work/decl.lus                    |    4 +-
 test/should_work/iter.lus                    |    2 +-
 test/should_work/pilote.lus                  |    5 +-
 test/should_work/{sqrt.lus => test_sqrt.lus} |    0
 test/site.exp                                |    8 +-
 10 files changed, 578 insertions(+), 567 deletions(-)
 rename test/should_work/{sqrt.lus => test_sqrt.lus} (100%)

diff --git a/lib/lv6MainArgs.ml b/lib/lv6MainArgs.ml
index 74818328..011070b1 100644
--- a/lib/lv6MainArgs.ml
+++ b/lib/lv6MainArgs.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 04/09/2019 (at 15:27) by Erwan Jahier> *)
+(* Time-stamp: <modified the 03/03/2020 (at 15:28) by Erwan Jahier> *)
 (*
 Le manager d'argument adapté de celui de lutin, plus joli
 N.B. solution un peu batarde : les options sont stockées, comme avant, dans Global,
@@ -257,7 +257,7 @@ let set_ec_options opt =
   ()
 
 let set_c_options opt =
-  opt.gen_c <- true;
+  opt.gen_c <- true; 
   (match global_opt.expand_enums with
    | AsEnum -> global_opt.expand_enums <- AsInt;
    (* only override the default in this case *)
@@ -599,6 +599,11 @@ let parse argv = (
        opt.others
     );
     opt.infiles <- (List.rev opt.others);
+    if opt.main_node = "" &&
+       (opt.gen_c || opt.exec  || opt.gen_lic )
+    then (
+      Printf.fprintf stderr "No node set: use -n to set a node\n";
+      exit 2);
     current := save_current;
     opt
   ) with
@@ -606,4 +611,3 @@ let parse argv = (
   | Bad msg -> Printf.fprintf stderr "%s\n" (first_line msg); usage stderr opt; exit 2; 
   | Help _msg -> help opt ();
 )
-
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 1c667c24..9a238b18 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
 ==> lus2lic0.sum <==
-Test run by jahier on Fri Feb 14 11:52:31 
+Test run by jahier on Tue Mar  3 17:07:25 
 Native configuration is x86_64-pc-linux-gnu
 
 		=== lus2lic0 tests ===
@@ -66,7 +66,7 @@ XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/lecte
 XFAIL: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/s.lus
 
 ==> lus2lic1.sum <==
-Test run by jahier on Fri Feb 14 11:52:32 
+Test run by jahier on Tue Mar  3 17:07:26 
 Native configuration is x86_64-pc-linux-gnu
 
 		=== lus2lic1 tests ===
@@ -214,7 +214,9 @@ PASS: ./lus2lic  {-2c complex.lus -n complex}
 PASS: ./lus2lic  {-2c compteur.lus -n compteur}
 PASS: sh compteur.sh 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c compteur.lus  {}
-FAIL: Generate c code  : ./lus2lic  {-2c cond01.lus -n cond01}
+PASS: ./lus2lic  {-2c cond01.lus -n cond01}
+PASS: sh cond01.sh 
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c cond01.lus  {}
 PASS: ./lus2lic  {-2c consensus.lus -n consensus}
 PASS: sh consensus.sh 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c consensus.lus  {}
@@ -409,10 +411,9 @@ PASS: sh multiclock.sh
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multiclock.lus  {}
 PASS: ./lus2lic  {-2c multipar.lus -n multipar}
 PASS: sh multipar.sh 
-PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus  {}
 
 ==> lus2lic2.sum <==
-Test run by jahier on Fri Feb 14 11:53:00 
+Test run by jahier on Tue Mar  3 17:08:00 
 Native configuration is x86_64-pc-linux-gnu
 
 		=== lus2lic2 tests ===
@@ -546,7 +547,7 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c param_node4.lus  {}
 PASS: ./lus2lic  {-2c param_struct.lus -n param_struct}
 PASS: sh param_struct.sh 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c param_struct.lus  {}
-FAIL: Generate c code  : ./lus2lic  --expand-nodes {-2c pilote.lus -n pilote}
+PASS: ./lus2lic  --expand-nodes {-2c pilote.lus -n pilote}
 PASS: ./lus2lic  {-2c pipeline.lus -n pipeline}
 PASS: sh pipeline.sh 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c pipeline.lus  {}
@@ -625,7 +626,6 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c sincos.lus  {}
 PASS: ./lus2lic  --expand-nodes {-2c speedcontrol.lus -n speedcontrol}
 PASS: sh speedcontrol.sh 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c speedcontrol.lus  { --expand-nodes}
-PASS: ./lus2lic  {-2c sqrt.lus -n sqrt}
 PASS: ./lus2lic  {-2c stopwatch.lus -n stopwatch}
 PASS: sh stopwatch.sh 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c stopwatch.lus  {}
@@ -692,6 +692,7 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c test_node_expand2.l
 PASS: ./lus2lic  {-2c test_poly.lus -n test_poly}
 PASS: sh test_poly.sh 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c test_poly.lus  {}
+PASS: ./lus2lic  {-2c test_sqrt.lus -n test_sqrt}
 PASS: ./lus2lic  {-2c test_struct.lus -n test_struct}
 PASS: sh test_struct.sh 
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c test_struct.lus  {}
@@ -752,7 +753,7 @@ PASS: sh zzz2.sh
 PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus  {}
 
 ==> lus2lic3.sum <==
-Test run by jahier on Fri Feb 14 11:53:34 
+Test run by jahier on Tue Mar  3 17:08:40 
 Native configuration is x86_64-pc-linux-gnu
 
 		=== lus2lic3 tests ===
@@ -762,511 +763,511 @@ Schedule of variations:
 
 Running target unix
 Running ./lus2lic.tests/test3.exp ...
-PASS: ./lus2lic {} {-lic -o COUNTER.lic COUNTER.lus}
-PASS: ./lus2lic {-ec -o COUNTER.ec COUNTER.lus}
+PASS: ./lus2lic {} {-lic -o COUNTER.lic COUNTER.lus -n COUNTER}
+PASS: ./lus2lic {-ec -o COUNTER.ec COUNTER.lus -n COUNTER}
 PASS: ./myec2c {-o COUNTER.c COUNTER.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node COUNTER.lus {}
-PASS: ./lus2lic {} {-lic -o CURRENT.lic CURRENT.lus}
-PASS: ./lus2lic {-ec -o CURRENT.ec CURRENT.lus}
+PASS: ./lus2lic {} {-lic -o CURRENT.lic CURRENT.lus -n CURRENT}
+PASS: ./lus2lic {-ec -o CURRENT.ec CURRENT.lus -n CURRENT}
 PASS: ./myec2c {-o CURRENT.c CURRENT.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node CURRENT.lus {}
-PASS: ./lus2lic {} {-lic -o Condact.lic Condact.lus}
-PASS: ./lus2lic {-ec -o Condact.ec Condact.lus}
+PASS: ./lus2lic {} {-lic -o Condact.lic Condact.lus -n Condact}
+PASS: ./lus2lic {-ec -o Condact.ec Condact.lus -n Condact}
 PASS: ./myec2c {-o Condact.c Condact.ec}
-PASS: ./lus2lic {} {-lic -o EDGE.lic EDGE.lus}
-PASS: ./lus2lic {-ec -o EDGE.ec EDGE.lus}
+PASS: ./lus2lic {} {-lic -o EDGE.lic EDGE.lus -n EDGE}
+PASS: ./lus2lic {-ec -o EDGE.ec EDGE.lus -n EDGE}
 PASS: ./myec2c {-o EDGE.c EDGE.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node EDGE.lus {}
-PASS: ./lus2lic {} {-lic -o ELMU.lic ELMU.lus}
-PASS: ./lus2lic {-ec -o ELMU.ec ELMU.lus}
+PASS: ./lus2lic {} {-lic -o ELMU.lic ELMU.lus -n ELMU}
+PASS: ./lus2lic {-ec -o ELMU.ec ELMU.lus -n ELMU}
 PASS: ./myec2c {-o ELMU.c ELMU.ec}
-PASS: ./lus2lic {} {-lic -o FALLING_EDGE.lic FALLING_EDGE.lus}
-PASS: ./lus2lic {-ec -o FALLING_EDGE.ec FALLING_EDGE.lus}
+PASS: ./lus2lic {} {-lic -o FALLING_EDGE.lic FALLING_EDGE.lus -n FALLING_EDGE}
+PASS: ./lus2lic {-ec -o FALLING_EDGE.ec FALLING_EDGE.lus -n FALLING_EDGE}
 PASS: ./myec2c {-o FALLING_EDGE.c FALLING_EDGE.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node FALLING_EDGE.lus {}
-PASS: ./lus2lic {} {-lic -o FillFollowedByRed.lic FillFollowedByRed.lus}
-PASS: ./lus2lic {-ec -o FillFollowedByRed.ec FillFollowedByRed.lus}
+PASS: ./lus2lic {} {-lic -o FillFollowedByRed.lic FillFollowedByRed.lus -n FillFollowedByRed}
+PASS: ./lus2lic {-ec -o FillFollowedByRed.ec FillFollowedByRed.lus -n FillFollowedByRed}
 PASS: ./myec2c {-o FillFollowedByRed.c FillFollowedByRed.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node FillFollowedByRed.lus {}
-PASS: ./lus2lic {} {-lic -o Gyroscope.lic Gyroscope.lus}
-PASS: ./lus2lic {-ec -o Gyroscope.ec Gyroscope.lus}
+PASS: ./lus2lic {} {-lic -o Gyroscope.lic Gyroscope.lus -n Gyroscope}
+PASS: ./lus2lic {-ec -o Gyroscope.ec Gyroscope.lus -n Gyroscope}
 PASS: ./myec2c {-o Gyroscope.c Gyroscope.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node Gyroscope.lus {}
-PASS: ./lus2lic {} {-lic -o Gyroscope2.lic Gyroscope2.lus}
-PASS: ./lus2lic {-ec -o Gyroscope2.ec Gyroscope2.lus}
+PASS: ./lus2lic {} {-lic -o Gyroscope2.lic Gyroscope2.lus -n Gyroscope2}
+PASS: ./lus2lic {-ec -o Gyroscope2.ec Gyroscope2.lus -n Gyroscope2}
 PASS: ./myec2c {-o Gyroscope2.c Gyroscope2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node Gyroscope2.lus {}
-PASS: ./lus2lic {} {-lic -o aa.lic aa.lus}
-PASS: ./lus2lic {-ec -o aa.ec aa.lus}
+PASS: ./lus2lic {} {-lic -o aa.lic aa.lus -n aa}
+PASS: ./lus2lic {-ec -o aa.ec aa.lus -n aa}
 PASS: ./myec2c {-o aa.c aa.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node aa.lus {}
-PASS: ./lus2lic {} {-lic -o access.lic access.lus}
-PASS: ./lus2lic {-ec -o access.ec access.lus}
+PASS: ./lus2lic {} {-lic -o access.lic access.lus -n access}
+PASS: ./lus2lic {-ec -o access.ec access.lus -n access}
 PASS: ./myec2c {-o access.c access.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node access.lus {}
-PASS: ./lus2lic { --expand-nodes} {-lic -o activation1.lic activation1.lus}
-PASS: ./lus2lic {-ec -o activation1.ec activation1.lus}
+PASS: ./lus2lic { --expand-nodes} {-lic -o activation1.lic activation1.lus -n activation1}
+PASS: ./lus2lic {-ec -o activation1.ec activation1.lus -n activation1}
 PASS: ./myec2c {-o activation1.c activation1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node activation1.lus { --expand-nodes}
-PASS: ./lus2lic { --expand-nodes} {-lic -o activation2.lic activation2.lus}
-PASS: ./lus2lic {-ec -o activation2.ec activation2.lus}
+PASS: ./lus2lic { --expand-nodes} {-lic -o activation2.lic activation2.lus -n activation2}
+PASS: ./lus2lic {-ec -o activation2.ec activation2.lus -n activation2}
 PASS: ./myec2c {-o activation2.c activation2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node activation2.lus { --expand-nodes}
-PASS: ./lus2lic {} {-lic -o activation_ec.lic activation_ec.lus}
-PASS: ./lus2lic {-ec -o activation_ec.ec activation_ec.lus}
+PASS: ./lus2lic {} {-lic -o activation_ec.lic activation_ec.lus -n activation_ec}
+PASS: ./lus2lic {-ec -o activation_ec.ec activation_ec.lus -n activation_ec}
 PASS: ./myec2c {-o activation_ec.c activation_ec.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node activation_ec.lus {}
-PASS: ./lus2lic {} {-lic -o after.lic after.lus}
-PASS: ./lus2lic {-ec -o after.ec after.lus}
+PASS: ./lus2lic {} {-lic -o after.lic after.lus -n after}
+PASS: ./lus2lic {-ec -o after.ec after.lus -n after}
 PASS: ./myec2c {-o after.c after.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node after.lus {}
-PASS: ./lus2lic {} {-lic -o alias.lic alias.lus}
-PASS: ./lus2lic {-ec -o alias.ec alias.lus}
+PASS: ./lus2lic {} {-lic -o alias.lic alias.lus -n alias}
+PASS: ./lus2lic {-ec -o alias.ec alias.lus -n alias}
 PASS: ./myec2c {-o alias.c alias.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node alias.lus {}
-PASS: ./lus2lic {} {-lic -o amaury.lic amaury.lus}
-PASS: ./lus2lic {-ec -o amaury.ec amaury.lus}
+PASS: ./lus2lic {} {-lic -o amaury.lic amaury.lus -n amaury}
+PASS: ./lus2lic {-ec -o amaury.ec amaury.lus -n amaury}
 PASS: ./myec2c {-o amaury.c amaury.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node amaury.lus {}
-PASS: ./lus2lic {} {-lic -o arbitre.lic arbitre.lus}
-PASS: ./lus2lic {-ec -o arbitre.ec arbitre.lus}
+PASS: ./lus2lic {} {-lic -o arbitre.lic arbitre.lus -n arbitre}
+PASS: ./lus2lic {-ec -o arbitre.ec arbitre.lus -n arbitre}
 PASS: ./myec2c {-o arbitre.c arbitre.ec}
-PASS: ./lus2lic {} {-lic -o argos.lic argos.lus}
-PASS: ./lus2lic {-ec -o argos.ec argos.lus}
+PASS: ./lus2lic {} {-lic -o argos.lic argos.lus -n argos}
+PASS: ./lus2lic {-ec -o argos.ec argos.lus -n argos}
 PASS: ./myec2c {-o argos.c argos.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node argos.lus {}
-PASS: ./lus2lic {} {-lic -o array_concat.lic array_concat.lus}
-PASS: ./lus2lic {-ec -o array_concat.ec array_concat.lus}
+PASS: ./lus2lic {} {-lic -o array_concat.lic array_concat.lus -n array_concat}
+PASS: ./lus2lic {-ec -o array_concat.ec array_concat.lus -n array_concat}
 PASS: ./myec2c {-o array_concat.c array_concat.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node array_concat.lus {}
-PASS: ./lus2lic {} {-lic -o array_concat2.lic array_concat2.lus}
-PASS: ./lus2lic {-ec -o array_concat2.ec array_concat2.lus}
+PASS: ./lus2lic {} {-lic -o array_concat2.lic array_concat2.lus -n array_concat2}
+PASS: ./lus2lic {-ec -o array_concat2.ec array_concat2.lus -n array_concat2}
 PASS: ./myec2c {-o array_concat2.c array_concat2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node array_concat2.lus {}
-PASS: ./lus2lic {} {-lic -o array_equals.lic array_equals.lus}
-PASS: ./lus2lic {-ec -o array_equals.ec array_equals.lus}
+PASS: ./lus2lic {} {-lic -o array_equals.lic array_equals.lus -n array_equals}
+PASS: ./lus2lic {-ec -o array_equals.ec array_equals.lus -n array_equals}
 PASS: ./myec2c {-o array_equals.c array_equals.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node array_equals.lus {}
-PASS: ./lus2lic {} {-lic -o arrays.lic arrays.lus}
-PASS: ./lus2lic {-ec -o arrays.ec arrays.lus}
+PASS: ./lus2lic {} {-lic -o arrays.lic arrays.lus -n arrays}
+PASS: ./lus2lic {-ec -o arrays.ec arrays.lus -n arrays}
 PASS: ./myec2c {-o arrays.c arrays.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node arrays.lus {}
-PASS: ./lus2lic { --expand-nodes} {-lic -o asservi.lic asservi.lus}
-PASS: ./lus2lic {-ec -o asservi.ec asservi.lus}
+PASS: ./lus2lic { --expand-nodes} {-lic -o asservi.lic asservi.lus -n asservi}
+PASS: ./lus2lic {-ec -o asservi.ec asservi.lus -n asservi}
 PASS: ./myec2c {-o asservi.c asservi.ec}
-PASS: ./lus2lic {} {-lic -o bad_call03.lic bad_call03.lus}
-PASS: ./lus2lic {-ec -o bad_call03.ec bad_call03.lus}
+PASS: ./lus2lic {} {-lic -o bad_call03.lic bad_call03.lus -n bad_call03}
+PASS: ./lus2lic {-ec -o bad_call03.ec bad_call03.lus -n bad_call03}
 PASS: ./myec2c {-o bad_call03.c bad_call03.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node bad_call03.lus {}
-PASS: ./lus2lic {} {-lic -o bascule.lic bascule.lus}
-PASS: ./lus2lic {-ec -o bascule.ec bascule.lus}
+PASS: ./lus2lic {} {-lic -o bascule.lic bascule.lus -n bascule}
+PASS: ./lus2lic {-ec -o bascule.ec bascule.lus -n bascule}
 PASS: ./myec2c {-o bascule.c bascule.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node bascule.lus {}
-PASS: ./lus2lic {} {-lic -o bob.lic bob.lus}
-PASS: ./lus2lic {-ec -o bob.ec bob.lus}
+PASS: ./lus2lic {} {-lic -o bob.lic bob.lus -n bob}
+PASS: ./lus2lic {-ec -o bob.ec bob.lus -n bob}
 PASS: ./myec2c {-o bob.c bob.ec}
 UNRESOLVED: Time out: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node bob.lus {}
-PASS: ./lus2lic {} {-lic -o bred.lic bred.lus}
-PASS: ./lus2lic {-ec -o bred.ec bred.lus}
+PASS: ./lus2lic {} {-lic -o bred.lic bred.lus -n bred}
+PASS: ./lus2lic {-ec -o bred.ec bred.lus -n bred}
 PASS: ./myec2c {-o bred.c bred.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node bred.lus {}
-PASS: ./lus2lic {} {-lic -o bred_lv4.lic bred_lv4.lus}
-PASS: ./lus2lic {-ec -o bred_lv4.ec bred_lv4.lus}
+PASS: ./lus2lic {} {-lic -o bred_lv4.lic bred_lv4.lus -n bred_lv4}
+PASS: ./lus2lic {-ec -o bred_lv4.ec bred_lv4.lus -n bred_lv4}
 PASS: ./myec2c {-o bred_lv4.c bred_lv4.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node bred_lv4.lus {}
-PASS: ./lus2lic {} {-lic -o bug.lic bug.lus}
-PASS: ./lus2lic {-ec -o bug.ec bug.lus}
+PASS: ./lus2lic {} {-lic -o bug.lic bug.lus -n bug}
+PASS: ./lus2lic {-ec -o bug.ec bug.lus -n bug}
 PASS: ./myec2c {-o bug.c bug.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node bug.lus {}
-PASS: ./lus2lic {} {-lic -o bug2.lic bug2.lus}
-PASS: ./lus2lic {-ec -o bug2.ec bug2.lus}
+PASS: ./lus2lic {} {-lic -o bug2.lic bug2.lus -n bug2}
+PASS: ./lus2lic {-ec -o bug2.ec bug2.lus -n bug2}
 PASS: ./myec2c {-o bug2.c bug2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node bug2.lus {}
-FAIL: without any option: ./lus2lic {} {-lic -o bug_map_fby.lic bug_map_fby.lus}
-PASS: ./lus2lic {} {-lic -o calculs_max.lic calculs_max.lus}
-PASS: ./lus2lic {-ec -o calculs_max.ec calculs_max.lus}
+FAIL: without any option: ./lus2lic {} {-lic -o bug_map_fby.lic bug_map_fby.lus -n bug_map_fby}
+PASS: ./lus2lic {} {-lic -o calculs_max.lic calculs_max.lus -n calculs_max}
+PASS: ./lus2lic {-ec -o calculs_max.ec calculs_max.lus -n calculs_max}
 PASS: ./myec2c {-o calculs_max.c calculs_max.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node calculs_max.lus {}
-PASS: ./lus2lic {} {-lic -o call.lic call.lus}
-PASS: ./lus2lic {-ec -o call.ec call.lus}
+PASS: ./lus2lic {} {-lic -o call.lic call.lus -n call}
+PASS: ./lus2lic {-ec -o call.ec call.lus -n call}
 PASS: ./myec2c {-o call.c call.ec}
-PASS: ./lus2lic {} {-lic -o call01.lic call01.lus}
-PASS: ./lus2lic {-ec -o call01.ec call01.lus}
+PASS: ./lus2lic {} {-lic -o call01.lic call01.lus -n call01}
+PASS: ./lus2lic {-ec -o call01.ec call01.lus -n call01}
 PASS: ./myec2c {-o call01.c call01.ec}
-PASS: ./lus2lic {} {-lic -o call02.lic call02.lus}
-PASS: ./lus2lic {-ec -o call02.ec call02.lus}
+PASS: ./lus2lic {} {-lic -o call02.lic call02.lus -n call02}
+PASS: ./lus2lic {-ec -o call02.ec call02.lus -n call02}
 PASS: ./myec2c {-o call02.c call02.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node call02.lus {}
-PASS: ./lus2lic {} {-lic -o call03.lic call03.lus}
-PASS: ./lus2lic {-ec -o call03.ec call03.lus}
+PASS: ./lus2lic {} {-lic -o call03.lic call03.lus -n call03}
+PASS: ./lus2lic {-ec -o call03.ec call03.lus -n call03}
 PASS: ./myec2c {-o call03.c call03.ec}
-PASS: ./lus2lic {} {-lic -o call04.lic call04.lus}
-PASS: ./lus2lic {-ec -o call04.ec call04.lus}
+PASS: ./lus2lic {} {-lic -o call04.lic call04.lus -n call04}
+PASS: ./lus2lic {-ec -o call04.ec call04.lus -n call04}
 PASS: ./myec2c {-o call04.c call04.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node call04.lus {}
-PASS: ./lus2lic {} {-lic -o call05.lic call05.lus}
-PASS: ./lus2lic {-ec -o call05.ec call05.lus}
+PASS: ./lus2lic {} {-lic -o call05.lic call05.lus -n call05}
+PASS: ./lus2lic {-ec -o call05.ec call05.lus -n call05}
 PASS: ./myec2c {-o call05.c call05.ec}
-PASS: ./lus2lic {} {-lic -o call06.lic call06.lus}
-PASS: ./lus2lic {-ec -o call06.ec call06.lus}
+PASS: ./lus2lic {} {-lic -o call06.lic call06.lus -n call06}
+PASS: ./lus2lic {-ec -o call06.ec call06.lus -n call06}
 PASS: ./myec2c {-o call06.c call06.ec}
-PASS: ./lus2lic {} {-lic -o call07.lic call07.lus}
-PASS: ./lus2lic {-ec -o call07.ec call07.lus}
+PASS: ./lus2lic {} {-lic -o call07.lic call07.lus -n call07}
+PASS: ./lus2lic {-ec -o call07.ec call07.lus -n call07}
 PASS: ./myec2c {-o call07.c call07.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node call07.lus {}
-PASS: ./lus2lic {} {-lic -o carV2.lic carV2.lus}
-PASS: ./lus2lic {-ec -o carV2.ec carV2.lus}
+PASS: ./lus2lic {} {-lic -o carV2.lic carV2.lus -n carV2}
+PASS: ./lus2lic {-ec -o carV2.ec carV2.lus -n carV2}
 PASS: ./myec2c {-o carV2.c carV2.ec}
-PASS: ./lus2lic {} {-lic -o carligths.lic carligths.lus}
-PASS: ./lus2lic {-ec -o carligths.ec carligths.lus}
+PASS: ./lus2lic {} {-lic -o carligths.lic carligths.lus -n carligths}
+PASS: ./lus2lic {-ec -o carligths.ec carligths.lus -n carligths}
 PASS: ./myec2c {-o carligths.c carligths.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node carligths.lus {}
-PASS: ./lus2lic {} {-lic -o ck2.lic ck2.lus}
-PASS: ./lus2lic {-ec -o ck2.ec ck2.lus}
+PASS: ./lus2lic {} {-lic -o ck2.lic ck2.lus -n ck2}
+PASS: ./lus2lic {-ec -o ck2.ec ck2.lus -n ck2}
 PASS: ./myec2c {-o ck2.c ck2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ck2.lus {}
-PASS: ./lus2lic {} {-lic -o ck3.lic ck3.lus}
-PASS: ./lus2lic {-ec -o ck3.ec ck3.lus}
+PASS: ./lus2lic {} {-lic -o ck3.lic ck3.lus -n ck3}
+PASS: ./lus2lic {-ec -o ck3.ec ck3.lus -n ck3}
 PASS: ./myec2c {-o ck3.c ck3.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ck3.lus {}
-PASS: ./lus2lic {} {-lic -o ck4.lic ck4.lus}
-PASS: ./lus2lic {-ec -o ck4.ec ck4.lus}
+PASS: ./lus2lic {} {-lic -o ck4.lic ck4.lus -n ck4}
+PASS: ./lus2lic {-ec -o ck4.ec ck4.lus -n ck4}
 PASS: ./myec2c {-o ck4.c ck4.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ck4.lus {}
-PASS: ./lus2lic {} {-lic -o ck5.lic ck5.lus}
-PASS: ./lus2lic {-ec -o ck5.ec ck5.lus}
+PASS: ./lus2lic {} {-lic -o ck5.lic ck5.lus -n ck5}
+PASS: ./lus2lic {-ec -o ck5.ec ck5.lus -n ck5}
 PASS: ./myec2c {-o ck5.c ck5.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ck5.lus {}
-FAIL: without any option: ./lus2lic {} {-lic -o ck6.lic ck6.lus}
-PASS: ./lus2lic {} {-lic -o ck7.lic ck7.lus}
-PASS: ./lus2lic {-ec -o ck7.ec ck7.lus}
+FAIL: without any option: ./lus2lic {} {-lic -o ck6.lic ck6.lus -n ck6}
+PASS: ./lus2lic {} {-lic -o ck7.lic ck7.lus -n ck7}
+PASS: ./lus2lic {-ec -o ck7.ec ck7.lus -n ck7}
 PASS: ./myec2c {-o ck7.c ck7.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ck7.lus {}
-PASS: ./lus2lic {} {-lic -o clock1_2ms.lic clock1_2ms.lus}
-PASS: ./lus2lic {-ec -o clock1_2ms.ec clock1_2ms.lus}
+PASS: ./lus2lic {} {-lic -o clock1_2ms.lic clock1_2ms.lus -n clock1_2ms}
+PASS: ./lus2lic {-ec -o clock1_2ms.ec clock1_2ms.lus -n clock1_2ms}
 PASS: ./myec2c {-o clock1_2ms.c clock1_2ms.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node clock1_2ms.lus {}
-PASS: ./lus2lic {} {-lic -o clock_ite.lic clock_ite.lus}
-PASS: ./lus2lic {-ec -o clock_ite.ec clock_ite.lus}
+PASS: ./lus2lic {} {-lic -o clock_ite.lic clock_ite.lus -n clock_ite}
+PASS: ./lus2lic {-ec -o clock_ite.ec clock_ite.lus -n clock_ite}
 PASS: ./myec2c {-o clock_ite.c clock_ite.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node clock_ite.lus {}
-PASS: ./lus2lic {} {-lic -o cminus.lic cminus.lus}
-PASS: ./lus2lic {-ec -o cminus.ec cminus.lus}
+PASS: ./lus2lic {} {-lic -o cminus.lic cminus.lus -n cminus}
+PASS: ./lus2lic {-ec -o cminus.ec cminus.lus -n cminus}
 PASS: ./myec2c {-o cminus.c cminus.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node cminus.lus {}
-PASS: ./lus2lic {} {-lic -o complex.lic complex.lus}
-PASS: ./lus2lic {-ec -o complex.ec complex.lus}
+PASS: ./lus2lic {} {-lic -o complex.lic complex.lus -n complex}
+PASS: ./lus2lic {-ec -o complex.ec complex.lus -n complex}
 PASS: ./myec2c {-o complex.c complex.ec}
-PASS: ./lus2lic {} {-lic -o compteur.lic compteur.lus}
-PASS: ./lus2lic {-ec -o compteur.ec compteur.lus}
+PASS: ./lus2lic {} {-lic -o compteur.lic compteur.lus -n compteur}
+PASS: ./lus2lic {-ec -o compteur.ec compteur.lus -n compteur}
 PASS: ./myec2c {-o compteur.c compteur.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node compteur.lus {}
-PASS: ./lus2lic {} {-lic -o cond01.lic cond01.lus}
-PASS: ./lus2lic {-ec -o cond01.ec cond01.lus}
+PASS: ./lus2lic {} {-lic -o cond01.lic cond01.lus -n cond01}
+PASS: ./lus2lic {-ec -o cond01.ec cond01.lus -n cond01}
 PASS: ./myec2c {-o cond01.c cond01.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node cond01.lus {}
-PASS: ./lus2lic {} {-lic -o consensus.lic consensus.lus}
-PASS: ./lus2lic {-ec -o consensus.ec consensus.lus}
+PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node cond01.lus {}
+PASS: ./lus2lic {} {-lic -o consensus.lic consensus.lus -n consensus}
+PASS: ./lus2lic {-ec -o consensus.ec consensus.lus -n consensus}
 PASS: ./myec2c {-o consensus.c consensus.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node consensus.lus {}
-PASS: ./lus2lic {} {-lic -o consensus2.lic consensus2.lus}
-PASS: ./lus2lic {-ec -o consensus2.ec consensus2.lus}
+PASS: ./lus2lic {} {-lic -o consensus2.lic consensus2.lus -n consensus2}
+PASS: ./lus2lic {-ec -o consensus2.ec consensus2.lus -n consensus2}
 PASS: ./myec2c {-o consensus2.c consensus2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node consensus2.lus {}
-PASS: ./lus2lic {} {-lic -o contractForElementSelectionInArray.lic contractForElementSelectionInArray.lus}
-PASS: ./lus2lic {-ec -o contractForElementSelectionInArray.ec contractForElementSelectionInArray.lus}
+PASS: ./lus2lic {} {-lic -o contractForElementSelectionInArray.lic contractForElementSelectionInArray.lus -n contractForElementSelectionInArray}
+PASS: ./lus2lic {-ec -o contractForElementSelectionInArray.ec contractForElementSelectionInArray.lus -n contractForElementSelectionInArray}
 PASS: ./myec2c {-o contractForElementSelectionInArray.c contractForElementSelectionInArray.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node contractForElementSelectionInArray.lus {}
-PASS: ./lus2lic {} {-lic -o convert.lic convert.lus}
-PASS: ./lus2lic {-ec -o convert.ec convert.lus}
+PASS: ./lus2lic {} {-lic -o convert.lic convert.lus -n convert}
+PASS: ./lus2lic {-ec -o convert.ec convert.lus -n convert}
 PASS: ./myec2c {-o convert.c convert.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node convert.lus {}
-PASS: ./lus2lic {} {-lic -o count.lic count.lus}
-PASS: ./lus2lic {-ec -o count.ec count.lus}
+PASS: ./lus2lic {} {-lic -o count.lic count.lus -n count}
+PASS: ./lus2lic {-ec -o count.ec count.lus -n count}
 PASS: ./myec2c {-o count.c count.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node count.lus {}
-PASS: ./lus2lic {} {-lic -o cpt.lic cpt.lus}
-PASS: ./lus2lic {-ec -o cpt.ec cpt.lus}
+PASS: ./lus2lic {} {-lic -o cpt.lic cpt.lus -n cpt}
+PASS: ./lus2lic {-ec -o cpt.ec cpt.lus -n cpt}
 PASS: ./myec2c {-o cpt.c cpt.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node cpt.lus {}
-PASS: ./lus2lic {} {-lic -o cst.lic cst.lus}
-PASS: ./lus2lic {-ec -o cst.ec cst.lus}
+PASS: ./lus2lic {} {-lic -o cst.lic cst.lus -n cst}
+PASS: ./lus2lic {-ec -o cst.ec cst.lus -n cst}
 PASS: ./myec2c {-o cst.c cst.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node cst.lus {}
-PASS: ./lus2lic { dadic.lv6} {-lic -o dadic_x5_a.lic dadic_x5_a.lus}
-PASS: ./lus2lic { dadic.lv6} {-lic -o dadic_x5_b.lic dadic_x5_b.lus}
-FAIL: without any option: ./lus2lic {} {-lic -o dadic_x5_c.lic dadic_x5_c.lus}
-PASS: ./lus2lic {} {-lic -o deSimone.lic deSimone.lus}
-PASS: ./lus2lic {-ec -o deSimone.ec deSimone.lus}
+PASS: ./lus2lic { dadic.lv6} {-lic -o dadic_x5_a.lic dadic_x5_a.lus -n dadic_x5_a}
+PASS: ./lus2lic { dadic.lv6} {-lic -o dadic_x5_b.lic dadic_x5_b.lus -n dadic_x5_b}
+FAIL: without any option: ./lus2lic {} {-lic -o dadic_x5_c.lic dadic_x5_c.lus -n dadic_x5_c}
+PASS: ./lus2lic {} {-lic -o deSimone.lic deSimone.lus -n deSimone}
+PASS: ./lus2lic {-ec -o deSimone.ec deSimone.lus -n deSimone}
 PASS: ./myec2c {-o deSimone.c deSimone.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node deSimone.lus {}
-PASS: ./lus2lic {} {-lic -o decl.lic decl.lus}
-PASS: ./lus2lic {-ec -o decl.ec decl.lus}
+PASS: ./lus2lic {} {-lic -o decl.lic decl.lus -n decl}
+PASS: ./lus2lic {-ec -o decl.ec decl.lus -n decl}
 PASS: ./myec2c {-o decl.c decl.ec}
-PASS: ./lus2lic {} {-lic -o declaration.lic declaration.lus}
-PASS: ./lus2lic {-ec -o declaration.ec declaration.lus}
+PASS: ./lus2lic {} {-lic -o declaration.lic declaration.lus -n declaration}
+PASS: ./lus2lic {-ec -o declaration.ec declaration.lus -n declaration}
 PASS: ./myec2c {-o declaration.c declaration.ec}
-PASS: ./lus2lic {} {-lic -o deconne.lic deconne.lus}
-PASS: ./lus2lic {-ec -o deconne.ec deconne.lus}
+PASS: ./lus2lic {} {-lic -o deconne.lic deconne.lus -n deconne}
+PASS: ./lus2lic {-ec -o deconne.ec deconne.lus -n deconne}
 PASS: ./myec2c {-o deconne.c deconne.ec}
-PASS: ./lus2lic {} {-lic -o dep.lic dep.lus}
-PASS: ./lus2lic {-ec -o dep.ec dep.lus}
+PASS: ./lus2lic {} {-lic -o dep.lic dep.lus -n dep}
+PASS: ./lus2lic {-ec -o dep.ec dep.lus -n dep}
 PASS: ./myec2c {-o dep.c dep.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node dep.lus {}
-PASS: ./lus2lic {} {-lic -o depend.lic depend.lus}
-PASS: ./lus2lic {-ec -o depend.ec depend.lus}
+PASS: ./lus2lic {} {-lic -o depend.lic depend.lus -n depend}
+PASS: ./lus2lic {-ec -o depend.ec depend.lus -n depend}
 PASS: ./myec2c {-o depend.c depend.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node depend.lus {}
-PASS: ./lus2lic {} {-lic -o dependeur.lic dependeur.lus}
-PASS: ./lus2lic {-ec -o dependeur.ec dependeur.lus}
+PASS: ./lus2lic {} {-lic -o dependeur.lic dependeur.lus -n dependeur}
+PASS: ./lus2lic {-ec -o dependeur.ec dependeur.lus -n dependeur}
 PASS: ./myec2c {-o dependeur.c dependeur.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node dependeur.lus {}
-PASS: ./lus2lic {} {-lic -o dependeur_struct.lic dependeur_struct.lus}
-PASS: ./lus2lic {-ec -o dependeur_struct.ec dependeur_struct.lus}
+PASS: ./lus2lic {} {-lic -o dependeur_struct.lic dependeur_struct.lus -n dependeur_struct}
+PASS: ./lus2lic {-ec -o dependeur_struct.ec dependeur_struct.lus -n dependeur_struct}
 PASS: ./myec2c {-o dependeur_struct.c dependeur_struct.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node dependeur_struct.lus {}
-PASS: ./lus2lic {} {-lic -o double_delay.lic double_delay.lus}
-PASS: ./lus2lic {-ec -o double_delay.ec double_delay.lus}
+PASS: ./lus2lic {} {-lic -o double_delay.lic double_delay.lus -n double_delay}
+PASS: ./lus2lic {-ec -o double_delay.ec double_delay.lus -n double_delay}
 PASS: ./myec2c {-o double_delay.c double_delay.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node double_delay.lus {}
-PASS: ./lus2lic {} {-lic -o ec.lic ec.lus}
-PASS: ./lus2lic {-ec -o ec.ec ec.lus}
+PASS: ./lus2lic {} {-lic -o ec.lic ec.lus -n ec}
+PASS: ./lus2lic {-ec -o ec.ec ec.lus -n ec}
 PASS: ./myec2c {-o ec.c ec.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ec.lus {}
-PASS: ./lus2lic {} {-lic -o enum0.lic enum0.lus}
-PASS: ./lus2lic {-ec -o enum0.ec enum0.lus}
+PASS: ./lus2lic {} {-lic -o enum0.lic enum0.lus -n enum0}
+PASS: ./lus2lic {-ec -o enum0.ec enum0.lus -n enum0}
 PASS: ./myec2c {-o enum0.c enum0.ec}
-PASS: ./lus2lic {} {-lic -o ex.lic ex.lus}
-PASS: ./lus2lic {-ec -o ex.ec ex.lus}
+PASS: ./lus2lic {} {-lic -o ex.lic ex.lus -n ex}
+PASS: ./lus2lic {-ec -o ex.ec ex.lus -n ex}
 PASS: ./myec2c {-o ex.c ex.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ex.lus {}
-PASS: ./lus2lic {} {-lic -o exclusion.lic exclusion.lus}
-PASS: ./lus2lic {-ec -o exclusion.ec exclusion.lus}
+PASS: ./lus2lic {} {-lic -o exclusion.lic exclusion.lus -n exclusion}
+PASS: ./lus2lic {-ec -o exclusion.ec exclusion.lus -n exclusion}
 PASS: ./myec2c {-o exclusion.c exclusion.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node exclusion.lus {}
-PASS: ./lus2lic {} {-lic -o filliter.lic filliter.lus}
-PASS: ./lus2lic {-ec -o filliter.ec filliter.lus}
+PASS: ./lus2lic {} {-lic -o filliter.lic filliter.lus -n filliter}
+PASS: ./lus2lic {-ec -o filliter.ec filliter.lus -n filliter}
 PASS: ./myec2c {-o filliter.c filliter.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node filliter.lus {}
-PASS: ./lus2lic {} {-lic -o filter.lic filter.lus}
-PASS: ./lus2lic {-ec -o filter.ec filter.lus}
+PASS: ./lus2lic {} {-lic -o filter.lic filter.lus -n filter}
+PASS: ./lus2lic {-ec -o filter.ec filter.lus -n filter}
 PASS: ./myec2c {-o filter.c filter.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node filter.lus {}
-PASS: ./lus2lic {} {-lic -o flo.lic flo.lus}
-PASS: ./lus2lic {-ec -o flo.ec flo.lus}
+PASS: ./lus2lic {} {-lic -o flo.lic flo.lus -n flo}
+PASS: ./lus2lic {-ec -o flo.ec flo.lus -n flo}
 PASS: ./myec2c {-o flo.c flo.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node flo.lus {}
-PASS: ./lus2lic {} {-lic -o followed_by.lic followed_by.lus}
-PASS: ./lus2lic {-ec -o followed_by.ec followed_by.lus}
+PASS: ./lus2lic {} {-lic -o followed_by.lic followed_by.lus -n followed_by}
+PASS: ./lus2lic {-ec -o followed_by.ec followed_by.lus -n followed_by}
 PASS: ./myec2c {-o followed_by.c followed_by.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node followed_by.lus {}
-PASS: ./lus2lic {} {-lic -o fresh_name.lic fresh_name.lus}
-PASS: ./lus2lic {-ec -o fresh_name.ec fresh_name.lus}
+PASS: ./lus2lic {} {-lic -o fresh_name.lic fresh_name.lus -n fresh_name}
+PASS: ./lus2lic {-ec -o fresh_name.ec fresh_name.lus -n fresh_name}
 PASS: ./myec2c {-o fresh_name.c fresh_name.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node fresh_name.lus {}
-PASS: ./lus2lic {} {-lic -o func_with_body.lic func_with_body.lus}
-PASS: ./lus2lic {-ec -o func_with_body.ec func_with_body.lus}
+PASS: ./lus2lic {} {-lic -o func_with_body.lic func_with_body.lus -n func_with_body}
+PASS: ./lus2lic {-ec -o func_with_body.ec func_with_body.lus -n func_with_body}
 PASS: ./myec2c {-o func_with_body.c func_with_body.ec}
-PASS: ./lus2lic {} {-lic -o hanane.lic hanane.lus}
-PASS: ./lus2lic {-ec -o hanane.ec hanane.lus}
+PASS: ./lus2lic {} {-lic -o hanane.lic hanane.lus -n hanane}
+PASS: ./lus2lic {-ec -o hanane.ec hanane.lus -n hanane}
 PASS: ./myec2c {-o hanane.c hanane.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node hanane.lus {}
-PASS: ./lus2lic {} {-lic -o heater_control.lic heater_control.lus}
-PASS: ./lus2lic {-ec -o heater_control.ec heater_control.lus}
+PASS: ./lus2lic {} {-lic -o heater_control.lic heater_control.lus -n heater_control}
+PASS: ./lus2lic {-ec -o heater_control.ec heater_control.lus -n heater_control}
 PASS: ./myec2c {-o heater_control.c heater_control.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node heater_control.lus {}
-PASS: ./lus2lic {} {-lic -o impl_priority.lic impl_priority.lus}
-PASS: ./lus2lic {-ec -o impl_priority.ec impl_priority.lus}
+PASS: ./lus2lic {} {-lic -o impl_priority.lic impl_priority.lus -n impl_priority}
+PASS: ./lus2lic {-ec -o impl_priority.ec impl_priority.lus -n impl_priority}
 PASS: ./myec2c {-o impl_priority.c impl_priority.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node impl_priority.lus {}
-PASS: ./lus2lic {} {-lic -o import1.lic import1.lus}
-PASS: ./lus2lic {-ec -o import1.ec import1.lus}
+PASS: ./lus2lic {} {-lic -o import1.lic import1.lus -n import1}
+PASS: ./lus2lic {-ec -o import1.ec import1.lus -n import1}
 PASS: ./myec2c {-o import1.c import1.ec}
-PASS: ./lus2lic {} {-lic -o initial.lic initial.lus}
-PASS: ./lus2lic {-ec -o initial.ec initial.lus}
+PASS: ./lus2lic {} {-lic -o initial.lic initial.lus -n initial}
+PASS: ./lus2lic {-ec -o initial.ec initial.lus -n initial}
 PASS: ./myec2c {-o initial.c initial.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node initial.lus {}
-PASS: ./lus2lic {} {-lic -o integrator.lic integrator.lus}
-PASS: ./lus2lic {-ec -o integrator.ec integrator.lus}
+PASS: ./lus2lic {} {-lic -o integrator.lic integrator.lus -n integrator}
+PASS: ./lus2lic {-ec -o integrator.ec integrator.lus -n integrator}
 PASS: ./myec2c {-o integrator.c integrator.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node integrator.lus {}
-PASS: ./lus2lic {} {-lic -o is_stable.lic is_stable.lus}
-PASS: ./lus2lic {-ec -o is_stable.ec is_stable.lus}
+PASS: ./lus2lic {} {-lic -o is_stable.lic is_stable.lus -n is_stable}
+PASS: ./lus2lic {-ec -o is_stable.ec is_stable.lus -n is_stable}
 PASS: ./myec2c {-o is_stable.c is_stable.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node is_stable.lus {}
-PASS: ./lus2lic {} {-lic -o iter.lic iter.lus}
-PASS: ./lus2lic {-ec -o iter.ec iter.lus}
+PASS: ./lus2lic {} {-lic -o iter.lic iter.lus -n iter}
+PASS: ./lus2lic {-ec -o iter.ec iter.lus -n iter}
 PASS: ./myec2c {-o iter.c iter.ec}
-FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node iter.lus {}
-PASS: ./lus2lic {} {-lic -o iterFibo.lic iterFibo.lus}
-PASS: ./lus2lic {-ec -o iterFibo.ec iterFibo.lus}
+PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node iter.lus {}
+PASS: ./lus2lic {} {-lic -o iterFibo.lic iterFibo.lus -n iterFibo}
+PASS: ./lus2lic {-ec -o iterFibo.ec iterFibo.lus -n iterFibo}
 PASS: ./myec2c {-o iterFibo.c iterFibo.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node iterFibo.lus {}
-PASS: ./lus2lic {} {-lic -o iterate.lic iterate.lus}
-PASS: ./lus2lic {-ec -o iterate.ec iterate.lus}
+PASS: ./lus2lic {} {-lic -o iterate.lic iterate.lus -n iterate}
+PASS: ./lus2lic {-ec -o iterate.ec iterate.lus -n iterate}
 PASS: ./myec2c {-o iterate.c iterate.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node iterate.lus {}
-PASS: ./lus2lic { "--expand-nodes -esa"} {-lic -o iterate_on_plus.lic iterate_on_plus.lus}
-PASS: ./lus2lic {} {-lic -o left.lic left.lus}
-PASS: ./lus2lic {-ec -o left.ec left.lus}
+PASS: ./lus2lic { "--expand-nodes -esa"} {-lic -o iterate_on_plus.lic iterate_on_plus.lus -n iterate_on_plus}
+PASS: ./lus2lic {} {-lic -o left.lic left.lus -n left}
+PASS: ./lus2lic {-ec -o left.ec left.lus -n left}
 PASS: ./myec2c {-o left.c left.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node left.lus {}
-PASS: ./lus2lic {} {-lic -o long_et_stupide_nom_de_noeud.lic long_et_stupide_nom_de_noeud.lus}
-PASS: ./lus2lic {-ec -o long_et_stupide_nom_de_noeud.ec long_et_stupide_nom_de_noeud.lus}
+PASS: ./lus2lic {} {-lic -o long_et_stupide_nom_de_noeud.lic long_et_stupide_nom_de_noeud.lus -n long_et_stupide_nom_de_noeud}
+PASS: ./lus2lic {-ec -o long_et_stupide_nom_de_noeud.ec long_et_stupide_nom_de_noeud.lus -n long_et_stupide_nom_de_noeud}
 PASS: ./myec2c {-o long_et_stupide_nom_de_noeud.c long_et_stupide_nom_de_noeud.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node long_et_stupide_nom_de_noeud.lus {}
-PASS: ./lus2lic {} {-lic -o lucky.lic lucky.lus}
-PASS: ./lus2lic {-ec -o lucky.ec lucky.lus}
+PASS: ./lus2lic {} {-lic -o lucky.lic lucky.lus -n lucky}
+PASS: ./lus2lic {-ec -o lucky.ec lucky.lus -n lucky}
 PASS: ./myec2c {-o lucky.c lucky.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node lucky.lus {}
-PASS: ./lus2lic {} {-lic -o lustre_test1_ok.lic lustre_test1_ok.lus}
-PASS: ./lus2lic {-ec -o lustre_test1_ok.ec lustre_test1_ok.lus}
+PASS: ./lus2lic {} {-lic -o lustre_test1_ok.lic lustre_test1_ok.lus -n lustre_test1_ok}
+PASS: ./lus2lic {-ec -o lustre_test1_ok.ec lustre_test1_ok.lus -n lustre_test1_ok}
 PASS: ./myec2c {-o lustre_test1_ok.c lustre_test1_ok.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node lustre_test1_ok.lus {}
-PASS: ./lus2lic {} {-lic -o map_red_iter.lic map_red_iter.lus}
-PASS: ./lus2lic {-ec -o map_red_iter.ec map_red_iter.lus}
+PASS: ./lus2lic {} {-lic -o map_red_iter.lic map_red_iter.lus -n map_red_iter}
+PASS: ./lus2lic {-ec -o map_red_iter.ec map_red_iter.lus -n map_red_iter}
 PASS: ./myec2c {-o map_red_iter.c map_red_iter.ec}
-PASS: ./lus2lic {} {-lic -o mapdeRed.lic mapdeRed.lus}
-PASS: ./lus2lic {-ec -o mapdeRed.ec mapdeRed.lus}
+PASS: ./lus2lic {} {-lic -o mapdeRed.lic mapdeRed.lus -n mapdeRed}
+PASS: ./lus2lic {-ec -o mapdeRed.ec mapdeRed.lus -n mapdeRed}
 PASS: ./myec2c {-o mapdeRed.c mapdeRed.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mapdeRed.lus {}
-PASS: ./lus2lic {} {-lic -o mapinf.lic mapinf.lus}
-PASS: ./lus2lic {-ec -o mapinf.ec mapinf.lus}
+PASS: ./lus2lic {} {-lic -o mapinf.lic mapinf.lus -n mapinf}
+PASS: ./lus2lic {-ec -o mapinf.ec mapinf.lus -n mapinf}
 PASS: ./myec2c {-o mapinf.c mapinf.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mapinf.lus {}
-PASS: ./lus2lic {} {-lic -o mapiter.lic mapiter.lus}
-PASS: ./lus2lic {-ec -o mapiter.ec mapiter.lus}
+PASS: ./lus2lic {} {-lic -o mapiter.lic mapiter.lus -n mapiter}
+PASS: ./lus2lic {-ec -o mapiter.ec mapiter.lus -n mapiter}
 PASS: ./myec2c {-o mapiter.c mapiter.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mapiter.lus {}
-PASS: ./lus2lic {} {-lic -o mappredef.lic mappredef.lus}
-PASS: ./lus2lic {-ec -o mappredef.ec mappredef.lus}
+PASS: ./lus2lic {} {-lic -o mappredef.lic mappredef.lus -n mappredef}
+PASS: ./lus2lic {-ec -o mappredef.ec mappredef.lus -n mappredef}
 PASS: ./myec2c {-o mappredef.c mappredef.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mappredef.lus {}
-PASS: ./lus2lic {} {-lic -o matrice.lic matrice.lus}
-PASS: ./lus2lic {-ec -o matrice.ec matrice.lus}
+PASS: ./lus2lic {} {-lic -o matrice.lic matrice.lus -n matrice}
+PASS: ./lus2lic {-ec -o matrice.ec matrice.lus -n matrice}
 PASS: ./myec2c {-o matrice.c matrice.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node matrice.lus {}
-PASS: ./lus2lic {} {-lic -o matrice2.lic matrice2.lus}
-PASS: ./lus2lic {-ec -o matrice2.ec matrice2.lus}
+PASS: ./lus2lic {} {-lic -o matrice2.lic matrice2.lus -n matrice2}
+PASS: ./lus2lic {-ec -o matrice2.ec matrice2.lus -n matrice2}
 PASS: ./myec2c {-o matrice2.c matrice2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node matrice2.lus {}
-PASS: ./lus2lic {} {-lic -o matrix_constant.lic matrix_constant.lus}
-PASS: ./lus2lic {-ec -o matrix_constant.ec matrix_constant.lus}
+PASS: ./lus2lic {} {-lic -o matrix_constant.lic matrix_constant.lus -n matrix_constant}
+PASS: ./lus2lic {-ec -o matrix_constant.ec matrix_constant.lus -n matrix_constant}
 PASS: ./myec2c {-o matrix_constant.c matrix_constant.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node matrix_constant.lus {}
-PASS: ./lus2lic {} {-lic -o minmax1.lic minmax1.lus}
-PASS: ./lus2lic {-ec -o minmax1.ec minmax1.lus}
+PASS: ./lus2lic {} {-lic -o minmax1.lic minmax1.lus -n minmax1}
+PASS: ./lus2lic {-ec -o minmax1.ec minmax1.lus -n minmax1}
 PASS: ./myec2c {-o minmax1.c minmax1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node minmax1.lus {}
-PASS: ./lus2lic {} {-lic -o minmax2.lic minmax2.lus}
-PASS: ./lus2lic {-ec -o minmax2.ec minmax2.lus}
+PASS: ./lus2lic {} {-lic -o minmax2.lic minmax2.lus -n minmax2}
+PASS: ./lus2lic {-ec -o minmax2.ec minmax2.lus -n minmax2}
 PASS: ./myec2c {-o minmax2.c minmax2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node minmax2.lus {}
-PASS: ./lus2lic {} {-lic -o minmax3.lic minmax3.lus}
-PASS: ./lus2lic {-ec -o minmax3.ec minmax3.lus}
+PASS: ./lus2lic {} {-lic -o minmax3.lic minmax3.lus -n minmax3}
+PASS: ./lus2lic {-ec -o minmax3.ec minmax3.lus -n minmax3}
 PASS: ./myec2c {-o minmax3.c minmax3.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node minmax3.lus {}
-PASS: ./lus2lic {} {-lic -o minmax4.lic minmax4.lus}
-PASS: ./lus2lic {-ec -o minmax4.ec minmax4.lus}
+PASS: ./lus2lic {} {-lic -o minmax4.lic minmax4.lus -n minmax4}
+PASS: ./lus2lic {-ec -o minmax4.ec minmax4.lus -n minmax4}
 PASS: ./myec2c {-o minmax4.c minmax4.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node minmax4.lus {}
-PASS: ./lus2lic {} {-lic -o minmax4_bis.lic minmax4_bis.lus}
-PASS: ./lus2lic {-ec -o minmax4_bis.ec minmax4_bis.lus}
+PASS: ./lus2lic {} {-lic -o minmax4_bis.lic minmax4_bis.lus -n minmax4_bis}
+PASS: ./lus2lic {-ec -o minmax4_bis.ec minmax4_bis.lus -n minmax4_bis}
 PASS: ./myec2c {-o minmax4_bis.c minmax4_bis.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node minmax4_bis.lus {}
-PASS: ./lus2lic {} {-lic -o minmax5.lic minmax5.lus}
-PASS: ./lus2lic {-ec -o minmax5.ec minmax5.lus}
+PASS: ./lus2lic {} {-lic -o minmax5.lic minmax5.lus -n minmax5}
+PASS: ./lus2lic {-ec -o minmax5.ec minmax5.lus -n minmax5}
 PASS: ./myec2c {-o minmax5.c minmax5.ec}
-PASS: ./lus2lic {} {-lic -o minmax5_random.lic minmax5_random.lus}
-PASS: ./lus2lic {-ec -o minmax5_random.ec minmax5_random.lus}
+PASS: ./lus2lic {} {-lic -o minmax5_random.lic minmax5_random.lus -n minmax5_random}
+PASS: ./lus2lic {-ec -o minmax5_random.ec minmax5_random.lus -n minmax5_random}
 PASS: ./myec2c {-o minmax5_random.c minmax5_random.ec}
-PASS: ./lus2lic {} {-lic -o minmax6.lic minmax6.lus}
-PASS: ./lus2lic {-ec -o minmax6.ec minmax6.lus}
+PASS: ./lus2lic {} {-lic -o minmax6.lic minmax6.lus -n minmax6}
+PASS: ./lus2lic {-ec -o minmax6.ec minmax6.lus -n minmax6}
 PASS: ./myec2c {-o minmax6.c minmax6.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node minmax6.lus {}
-PASS: ./lus2lic {} {-lic -o minus.lic minus.lus}
-PASS: ./lus2lic {-ec -o minus.ec minus.lus}
+PASS: ./lus2lic {} {-lic -o minus.lic minus.lus -n minus}
+PASS: ./lus2lic {-ec -o minus.ec minus.lus -n minus}
 PASS: ./myec2c {-o minus.c minus.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node minus.lus {}
-PASS: ./lus2lic {} {-lic -o mm.lic mm.lus}
-PASS: ./lus2lic {-ec -o mm.ec mm.lus}
+PASS: ./lus2lic {} {-lic -o mm.lic mm.lus -n mm}
+PASS: ./lus2lic {-ec -o mm.ec mm.lus -n mm}
 PASS: ./myec2c {-o mm.c mm.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mm.lus {}
-PASS: ./lus2lic {} {-lic -o mm1.lic mm1.lus}
-PASS: ./lus2lic {-ec -o mm1.ec mm1.lus}
+PASS: ./lus2lic {} {-lic -o mm1.lic mm1.lus -n mm1}
+PASS: ./lus2lic {-ec -o mm1.ec mm1.lus -n mm1}
 PASS: ./myec2c {-o mm1.c mm1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mm1.lus {}
-PASS: ./lus2lic {} {-lic -o mm22.lic mm22.lus}
-PASS: ./lus2lic {-ec -o mm22.ec mm22.lus}
+PASS: ./lus2lic {} {-lic -o mm22.lic mm22.lus -n mm22}
+PASS: ./lus2lic {-ec -o mm22.ec mm22.lus -n mm22}
 PASS: ./myec2c {-o mm22.c mm22.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mm22.lus {}
-PASS: ./lus2lic {} {-lic -o mm3.lic mm3.lus}
-PASS: ./lus2lic {-ec -o mm3.ec mm3.lus}
+PASS: ./lus2lic {} {-lic -o mm3.lic mm3.lus -n mm3}
+PASS: ./lus2lic {-ec -o mm3.ec mm3.lus -n mm3}
 PASS: ./myec2c {-o mm3.c mm3.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mm3.lus {}
-PASS: ./lus2lic {} {-lic -o modelInst.lic modelInst.lus}
-PASS: ./lus2lic {-ec -o modelInst.ec modelInst.lus}
+PASS: ./lus2lic {} {-lic -o modelInst.lic modelInst.lus -n modelInst}
+PASS: ./lus2lic {-ec -o modelInst.ec modelInst.lus -n modelInst}
 PASS: ./myec2c {-o modelInst.c modelInst.ec}
-PASS: ./lus2lic {} {-lic -o modes3x2_v2.lic modes3x2_v2.lus}
-PASS: ./lus2lic {-ec -o modes3x2_v2.ec modes3x2_v2.lus}
+PASS: ./lus2lic {} {-lic -o modes3x2_v2.lic modes3x2_v2.lus -n modes3x2_v2}
+PASS: ./lus2lic {-ec -o modes3x2_v2.ec modes3x2_v2.lus -n modes3x2_v2}
 PASS: ./myec2c {-o modes3x2_v2.c modes3x2_v2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node modes3x2_v2.lus {}
-PASS: ./lus2lic {} {-lic -o modes3x2_v3.lic modes3x2_v3.lus}
-PASS: ./lus2lic {-ec -o modes3x2_v3.ec modes3x2_v3.lus}
-PASS: ./lus2lic {} {-lic -o modes3x2_v4.lic modes3x2_v4.lus}
-PASS: ./lus2lic {-ec -o modes3x2_v4.ec modes3x2_v4.lus}
-PASS: ./lus2lic {} {-lic -o morel.lic morel.lus}
-PASS: ./lus2lic {-ec -o morel.ec morel.lus}
+PASS: ./lus2lic {} {-lic -o modes3x2_v3.lic modes3x2_v3.lus -n modes3x2_v3}
+PASS: ./lus2lic {-ec -o modes3x2_v3.ec modes3x2_v3.lus -n modes3x2_v3}
+PASS: ./lus2lic {} {-lic -o modes3x2_v4.lic modes3x2_v4.lus -n modes3x2_v4}
+PASS: ./lus2lic {-ec -o modes3x2_v4.ec modes3x2_v4.lus -n modes3x2_v4}
+PASS: ./lus2lic {} {-lic -o morel.lic morel.lus -n morel}
+PASS: ./lus2lic {-ec -o morel.ec morel.lus -n morel}
 PASS: ./myec2c {-o morel.c morel.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node morel.lus {}
-PASS: ./lus2lic {} {-lic -o morel2.lic morel2.lus}
-PASS: ./lus2lic {-ec -o morel2.ec morel2.lus}
+PASS: ./lus2lic {} {-lic -o morel2.lic morel2.lus -n morel2}
+PASS: ./lus2lic {-ec -o morel2.ec morel2.lus -n morel2}
 PASS: ./myec2c {-o morel2.c morel2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node morel2.lus {}
-PASS: ./lus2lic {} {-lic -o morel3.lic morel3.lus}
-PASS: ./lus2lic {-ec -o morel3.ec morel3.lus}
+PASS: ./lus2lic {} {-lic -o morel3.lic morel3.lus -n morel3}
+PASS: ./lus2lic {-ec -o morel3.ec morel3.lus -n morel3}
 PASS: ./myec2c {-o morel3.c morel3.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node morel3.lus {}
-PASS: ./lus2lic {} {-lic -o morel4.lic morel4.lus}
-PASS: ./lus2lic {-ec -o morel4.ec morel4.lus}
+PASS: ./lus2lic {} {-lic -o morel4.lic morel4.lus -n morel4}
+PASS: ./lus2lic {-ec -o morel4.ec morel4.lus -n morel4}
 PASS: ./myec2c {-o morel4.c morel4.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node morel4.lus {}
-PASS: ./lus2lic {} {-lic -o morel5.lic morel5.lus}
-PASS: ./lus2lic {-ec -o morel5.ec morel5.lus}
+PASS: ./lus2lic {} {-lic -o morel5.lic morel5.lus -n morel5}
+PASS: ./lus2lic {-ec -o morel5.ec morel5.lus -n morel5}
 PASS: ./myec2c {-o morel5.c morel5.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node morel5.lus {}
-PASS: ./lus2lic {} {-lic -o mouse.lic mouse.lus}
-PASS: ./lus2lic {-ec -o mouse.ec mouse.lus}
+PASS: ./lus2lic {} {-lic -o mouse.lic mouse.lus -n mouse}
+PASS: ./lus2lic {-ec -o mouse.ec mouse.lus -n mouse}
 PASS: ./myec2c {-o mouse.c mouse.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mouse.lus {}
-PASS: ./lus2lic {} {-lic -o mouse1.lic mouse1.lus}
-PASS: ./lus2lic {-ec -o mouse1.ec mouse1.lus}
+PASS: ./lus2lic {} {-lic -o mouse1.lic mouse1.lus -n mouse1}
+PASS: ./lus2lic {-ec -o mouse1.ec mouse1.lus -n mouse1}
 PASS: ./myec2c {-o mouse1.c mouse1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mouse1.lus {}
-PASS: ./lus2lic {} {-lic -o mouse2.lic mouse2.lus}
-PASS: ./lus2lic {-ec -o mouse2.ec mouse2.lus}
+PASS: ./lus2lic {} {-lic -o mouse2.lic mouse2.lus -n mouse2}
+PASS: ./lus2lic {-ec -o mouse2.ec mouse2.lus -n mouse2}
 PASS: ./myec2c {-o mouse2.c mouse2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mouse2.lus {}
-PASS: ./lus2lic {} {-lic -o mouse3.lic mouse3.lus}
-PASS: ./lus2lic {-ec -o mouse3.ec mouse3.lus}
+PASS: ./lus2lic {} {-lic -o mouse3.lic mouse3.lus -n mouse3}
+PASS: ./lus2lic {-ec -o mouse3.ec mouse3.lus -n mouse3}
 PASS: ./myec2c {-o mouse3.c mouse3.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mouse3.lus {}
-PASS: ./lus2lic {} {-lic -o moyenne.lic moyenne.lus}
-PASS: ./lus2lic {-ec -o moyenne.ec moyenne.lus}
+PASS: ./lus2lic {} {-lic -o moyenne.lic moyenne.lus -n moyenne}
+PASS: ./lus2lic {-ec -o moyenne.ec moyenne.lus -n moyenne}
 PASS: ./myec2c {-o moyenne.c moyenne.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node moyenne.lus {}
-PASS: ./lus2lic {} {-lic -o multiclock.lic multiclock.lus}
-PASS: ./lus2lic {-ec -o multiclock.ec multiclock.lus}
+PASS: ./lus2lic {} {-lic -o multiclock.lic multiclock.lus -n multiclock}
+PASS: ./lus2lic {-ec -o multiclock.ec multiclock.lus -n multiclock}
 PASS: ./myec2c {-o multiclock.c multiclock.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multiclock.lus {}
-PASS: ./lus2lic {} {-lic -o multipar.lic multipar.lus}
-PASS: ./lus2lic {-ec -o multipar.ec multipar.lus}
+PASS: ./lus2lic {} {-lic -o multipar.lic multipar.lus -n multipar}
+PASS: ./lus2lic {-ec -o multipar.ec multipar.lus -n multipar}
 PASS: ./myec2c {-o multipar.c multipar.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
 
 
 ==> lus2lic4.sum <==
-Test run by jahier on Fri Feb 14 11:54:15 
+Test run by jahier on Tue Mar  3 17:09:26 
 Native configuration is x86_64-pc-linux-gnu
 
 		=== lus2lic4 tests ===
@@ -1276,475 +1277,478 @@ Schedule of variations:
 
 Running target unix
 Running ./lus2lic.tests/test4.exp ...
-FAIL: without any option: ./lus2lic {} {-lic -o PCOND.lic PCOND.lus}
-FAIL: without any option: ./lus2lic {} {-lic -o PCOND1.lic PCOND1.lus}
-PASS: ./lus2lic {} {-lic -o SOURIS.lic SOURIS.lus}
-PASS: ./lus2lic {-ec -o SOURIS.ec SOURIS.lus}
+FAIL: without any option: ./lus2lic {} {-lic -o PCOND.lic PCOND.lus -n PCOND}
+FAIL: without any option: ./lus2lic {} {-lic -o PCOND1.lic PCOND1.lus -n PCOND1}
+PASS: ./lus2lic {} {-lic -o SOURIS.lic SOURIS.lus -n SOURIS}
+PASS: ./lus2lic {-ec -o SOURIS.ec SOURIS.lus -n SOURIS}
 PASS: ./myec2c {-o SOURIS.c SOURIS.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node SOURIS.lus {}
-PASS: ./lus2lic {} {-lic -o STABLE.lic STABLE.lus}
-PASS: ./lus2lic {-ec -o STABLE.ec STABLE.lus}
+PASS: ./lus2lic {} {-lic -o STABLE.lic STABLE.lus -n STABLE}
+PASS: ./lus2lic {-ec -o STABLE.ec STABLE.lus -n STABLE}
 PASS: ./myec2c {-o STABLE.c STABLE.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node STABLE.lus {}
-PASS: ./lus2lic {} {-lic -o SWITCH.lic SWITCH.lus}
-PASS: ./lus2lic {-ec -o SWITCH.ec SWITCH.lus}
+PASS: ./lus2lic {} {-lic -o SWITCH.lic SWITCH.lus -n SWITCH}
+PASS: ./lus2lic {-ec -o SWITCH.ec SWITCH.lus -n SWITCH}
 PASS: ./myec2c {-o SWITCH.c SWITCH.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node SWITCH.lus {}
-PASS: ./lus2lic {} {-lic -o SWITCH1.lic SWITCH1.lus}
-PASS: ./lus2lic {-ec -o SWITCH1.ec SWITCH1.lus}
+PASS: ./lus2lic {} {-lic -o SWITCH1.lic SWITCH1.lus -n SWITCH1}
+PASS: ./lus2lic {-ec -o SWITCH1.ec SWITCH1.lus -n SWITCH1}
 PASS: ./myec2c {-o SWITCH1.c SWITCH1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node SWITCH1.lus {}
-PASS: ./lus2lic {} {-lic -o TIME_STABLE.lic TIME_STABLE.lus}
-PASS: ./lus2lic {-ec -o TIME_STABLE.ec TIME_STABLE.lus}
+PASS: ./lus2lic {} {-lic -o TIME_STABLE.lic TIME_STABLE.lus -n TIME_STABLE}
+PASS: ./lus2lic {-ec -o TIME_STABLE.ec TIME_STABLE.lus -n TIME_STABLE}
 PASS: ./myec2c {-o TIME_STABLE.c TIME_STABLE.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node TIME_STABLE.lus {}
-PASS: ./lus2lic {} {-lic -o TIME_STABLE1.lic TIME_STABLE1.lus}
-PASS: ./lus2lic {-ec -o TIME_STABLE1.ec TIME_STABLE1.lus}
+PASS: ./lus2lic {} {-lic -o TIME_STABLE1.lic TIME_STABLE1.lus -n TIME_STABLE1}
+PASS: ./lus2lic {-ec -o TIME_STABLE1.ec TIME_STABLE1.lus -n TIME_STABLE1}
 PASS: ./myec2c {-o TIME_STABLE1.c TIME_STABLE1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node TIME_STABLE1.lus {}
-PASS: ./lus2lic {} {-lic -o Watch.lic Watch.lus}
-PASS: ./lus2lic {-ec -o Watch.ec Watch.lus}
+PASS: ./lus2lic {} {-lic -o Watch.lic Watch.lus -n Watch}
+PASS: ./lus2lic {-ec -o Watch.ec Watch.lus -n Watch}
 PASS: ./myec2c {-o Watch.c Watch.ec}
-PASS: ./lus2lic {} {-lic -o X.lic X.lus}
-PASS: ./lus2lic {-ec -o X.ec X.lus}
+PASS: ./lus2lic {} {-lic -o X.lic X.lus -n X}
+PASS: ./lus2lic {-ec -o X.ec X.lus -n X}
 PASS: ./myec2c {-o X.c X.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node X.lus {}
-PASS: ./lus2lic {} {-lic -o X2.lic X2.lus}
-PASS: ./lus2lic {-ec -o X2.ec X2.lus}
+PASS: ./lus2lic {} {-lic -o X2.lic X2.lus -n X2}
+PASS: ./lus2lic {-ec -o X2.ec X2.lus -n X2}
 PASS: ./myec2c {-o X2.c X2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node X2.lus {}
-FAIL: without any option: ./lus2lic {} {-lic -o X6.lic X6.lus}
-PASS: ./lus2lic {} {-lic -o Xr.lic Xr.lus}
-PASS: ./lus2lic {-ec -o Xr.ec Xr.lus}
+FAIL: without any option: ./lus2lic {} {-lic -o X6.lic X6.lus -n X6}
+PASS: ./lus2lic {} {-lic -o Xr.lic Xr.lus -n Xr}
+PASS: ./lus2lic {-ec -o Xr.ec Xr.lus -n Xr}
 PASS: ./myec2c {-o Xr.c Xr.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node Xr.lus {}
-PASS: ./lus2lic {} {-lic -o nc1.lic nc1.lus}
-PASS: ./lus2lic {-ec -o nc1.ec nc1.lus}
+PASS: ./lus2lic {} {-lic -o nc1.lic nc1.lus -n nc1}
+PASS: ./lus2lic {-ec -o nc1.ec nc1.lus -n nc1}
 PASS: ./myec2c {-o nc1.c nc1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc1.lus {}
-PASS: ./lus2lic {} {-lic -o nc10.lic nc10.lus}
-PASS: ./lus2lic {-ec -o nc10.ec nc10.lus}
+PASS: ./lus2lic {} {-lic -o nc10.lic nc10.lus -n nc10}
+PASS: ./lus2lic {-ec -o nc10.ec nc10.lus -n nc10}
 PASS: ./myec2c {-o nc10.c nc10.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc10.lus {}
-PASS: ./lus2lic {} {-lic -o nc2.lic nc2.lus}
-PASS: ./lus2lic {-ec -o nc2.ec nc2.lus}
+PASS: ./lus2lic {} {-lic -o nc2.lic nc2.lus -n nc2}
+PASS: ./lus2lic {-ec -o nc2.ec nc2.lus -n nc2}
 PASS: ./myec2c {-o nc2.c nc2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc2.lus {}
-PASS: ./lus2lic {} {-lic -o nc3.lic nc3.lus}
-PASS: ./lus2lic {-ec -o nc3.ec nc3.lus}
+PASS: ./lus2lic {} {-lic -o nc3.lic nc3.lus -n nc3}
+PASS: ./lus2lic {-ec -o nc3.ec nc3.lus -n nc3}
 PASS: ./myec2c {-o nc3.c nc3.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc3.lus {}
-PASS: ./lus2lic {} {-lic -o nc4.lic nc4.lus}
-PASS: ./lus2lic {-ec -o nc4.ec nc4.lus}
+PASS: ./lus2lic {} {-lic -o nc4.lic nc4.lus -n nc4}
+PASS: ./lus2lic {-ec -o nc4.ec nc4.lus -n nc4}
 PASS: ./myec2c {-o nc4.c nc4.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc4.lus {}
-PASS: ./lus2lic {} {-lic -o nc5.lic nc5.lus}
-PASS: ./lus2lic {-ec -o nc5.ec nc5.lus}
+PASS: ./lus2lic {} {-lic -o nc5.lic nc5.lus -n nc5}
+PASS: ./lus2lic {-ec -o nc5.ec nc5.lus -n nc5}
 PASS: ./myec2c {-o nc5.c nc5.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc5.lus {}
-PASS: ./lus2lic {} {-lic -o nc6.lic nc6.lus}
-PASS: ./lus2lic {-ec -o nc6.ec nc6.lus}
+PASS: ./lus2lic {} {-lic -o nc6.lic nc6.lus -n nc6}
+PASS: ./lus2lic {-ec -o nc6.ec nc6.lus -n nc6}
 PASS: ./myec2c {-o nc6.c nc6.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc6.lus {}
-PASS: ./lus2lic {} {-lic -o nc7.lic nc7.lus}
-PASS: ./lus2lic {-ec -o nc7.ec nc7.lus}
+PASS: ./lus2lic {} {-lic -o nc7.lic nc7.lus -n nc7}
+PASS: ./lus2lic {-ec -o nc7.ec nc7.lus -n nc7}
 PASS: ./myec2c {-o nc7.c nc7.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc7.lus {}
-PASS: ./lus2lic {} {-lic -o nc8.lic nc8.lus}
-PASS: ./lus2lic {-ec -o nc8.ec nc8.lus}
+PASS: ./lus2lic {} {-lic -o nc8.lic nc8.lus -n nc8}
+PASS: ./lus2lic {-ec -o nc8.ec nc8.lus -n nc8}
 PASS: ./myec2c {-o nc8.c nc8.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc8.lus {}
-PASS: ./lus2lic {} {-lic -o nc9.lic nc9.lus}
-PASS: ./lus2lic {-ec -o nc9.ec nc9.lus}
+PASS: ./lus2lic {} {-lic -o nc9.lic nc9.lus -n nc9}
+PASS: ./lus2lic {-ec -o nc9.ec nc9.lus -n nc9}
 PASS: ./myec2c {-o nc9.c nc9.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nc9.lus {}
-PASS: ./lus2lic {} {-lic -o nested.lic nested.lus}
-PASS: ./lus2lic {-ec -o nested.ec nested.lus}
+PASS: ./lus2lic {} {-lic -o nested.lic nested.lus -n nested}
+PASS: ./lus2lic {-ec -o nested.ec nested.lus -n nested}
 PASS: ./myec2c {-o nested.c nested.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nested.lus {}
-PASS: ./lus2lic {} {-lic -o newpacks.lic newpacks.lus}
-PASS: ./lus2lic {-ec -o newpacks.ec newpacks.lus}
+PASS: ./lus2lic {} {-lic -o newpacks.lic newpacks.lus -n newpacks}
+PASS: ./lus2lic {-ec -o newpacks.ec newpacks.lus -n newpacks}
 PASS: ./myec2c {-o newpacks.c newpacks.ec}
-PASS: ./lus2lic {} {-lic -o noAlarm.lic noAlarm.lus}
-PASS: ./lus2lic {-ec -o noAlarm.ec noAlarm.lus}
+PASS: ./lus2lic {} {-lic -o noAlarm.lic noAlarm.lus -n noAlarm}
+PASS: ./lus2lic {-ec -o noAlarm.ec noAlarm.lus -n noAlarm}
 PASS: ./myec2c {-o noAlarm.c noAlarm.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node noAlarm.lus {}
-PASS: ./lus2lic {} {-lic -o node_caller1.lic node_caller1.lus}
-PASS: ./lus2lic {-ec -o node_caller1.ec node_caller1.lus}
+PASS: ./lus2lic {} {-lic -o node_caller1.lic node_caller1.lus -n node_caller1}
+PASS: ./lus2lic {-ec -o node_caller1.ec node_caller1.lus -n node_caller1}
 PASS: ./myec2c {-o node_caller1.c node_caller1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node node_caller1.lus {}
-PASS: ./lus2lic {} {-lic -o nodeparam.lic nodeparam.lus}
-PASS: ./lus2lic {-ec -o nodeparam.ec nodeparam.lus}
+PASS: ./lus2lic {} {-lic -o nodeparam.lic nodeparam.lus -n nodeparam}
+PASS: ./lus2lic {-ec -o nodeparam.ec nodeparam.lus -n nodeparam}
 PASS: ./myec2c {-o nodeparam.c nodeparam.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node nodeparam.lus {}
-PASS: ./lus2lic {} {-lic -o noeudsIndependants.lic noeudsIndependants.lus}
-PASS: ./lus2lic {-ec -o noeudsIndependants.ec noeudsIndependants.lus}
+PASS: ./lus2lic {} {-lic -o noeudsIndependants.lic noeudsIndependants.lus -n noeudsIndependants}
+PASS: ./lus2lic {-ec -o noeudsIndependants.ec noeudsIndependants.lus -n noeudsIndependants}
 PASS: ./myec2c {-o noeudsIndependants.c noeudsIndependants.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node noeudsIndependants.lus {}
-PASS: ./lus2lic {} {-lic -o noinput.lic noinput.lus}
-FAIL: Generate ec code  : ./lus2lic {-ec -o noinput.ec noinput.lus}
-PASS: ./lus2lic {} {-lic -o normal.lic normal.lus}
-PASS: ./lus2lic {-ec -o normal.ec normal.lus}
+PASS: ./lus2lic {} {-lic -o noinput.lic noinput.lus -n noinput}
+FAIL: Generate ec code  : ./lus2lic {-ec -o noinput.ec noinput.lus -n noinput}
+PASS: ./lus2lic {} {-lic -o normal.lic normal.lus -n normal}
+PASS: ./lus2lic {-ec -o normal.ec normal.lus -n normal}
 PASS: ./myec2c {-o normal.c normal.ec}
-PASS: ./lus2lic {} {-lic -o notTwo.lic notTwo.lus}
-PASS: ./lus2lic {-ec -o notTwo.ec notTwo.lus}
+PASS: ./lus2lic {} {-lic -o notTwo.lic notTwo.lus -n notTwo}
+PASS: ./lus2lic {-ec -o notTwo.ec notTwo.lus -n notTwo}
 PASS: ./myec2c {-o notTwo.c notTwo.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node notTwo.lus {}
-PASS: ./lus2lic {} {-lic -o o2l_feux_compl.lic o2l_feux_compl.lus}
-PASS: ./lus2lic {-ec -o o2l_feux_compl.ec o2l_feux_compl.lus}
+PASS: ./lus2lic {} {-lic -o o2l_feux_compl.lic o2l_feux_compl.lus -n o2l_feux_compl}
+PASS: ./lus2lic {-ec -o o2l_feux_compl.ec o2l_feux_compl.lus -n o2l_feux_compl}
 PASS: ./myec2c {-o o2l_feux_compl.c o2l_feux_compl.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node o2l_feux_compl.lus {}
-PASS: ./lus2lic {} {-lic -o oneq.lic oneq.lus}
-PASS: ./lus2lic {-ec -o oneq.ec oneq.lus}
+PASS: ./lus2lic {} {-lic -o oneq.lic oneq.lus -n oneq}
+PASS: ./lus2lic {-ec -o oneq.ec oneq.lus -n oneq}
 PASS: ./myec2c {-o oneq.c oneq.ec}
-PASS: ./lus2lic {} {-lic -o onlyroll.lic onlyroll.lus}
-PASS: ./lus2lic {-ec -o onlyroll.ec onlyroll.lus}
+PASS: ./lus2lic {} {-lic -o onlyroll.lic onlyroll.lus -n onlyroll}
+PASS: ./lus2lic {-ec -o onlyroll.ec onlyroll.lus -n onlyroll}
 PASS: ./myec2c {-o onlyroll.c onlyroll.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node onlyroll.lus {}
-PASS: ./lus2lic {} {-lic -o onlyroll2.lic onlyroll2.lus}
-PASS: ./lus2lic {-ec -o onlyroll2.ec onlyroll2.lus}
+PASS: ./lus2lic {} {-lic -o onlyroll2.lic onlyroll2.lus -n onlyroll2}
+PASS: ./lus2lic {-ec -o onlyroll2.ec onlyroll2.lus -n onlyroll2}
 PASS: ./myec2c {-o onlyroll2.c onlyroll2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node onlyroll2.lus {}
-PASS: ./lus2lic {} {-lic -o over2.lic over2.lus}
-PASS: ./lus2lic {-ec -o over2.ec over2.lus}
+PASS: ./lus2lic {} {-lic -o over2.lic over2.lus -n over2}
+PASS: ./lus2lic {-ec -o over2.ec over2.lus -n over2}
 PASS: ./myec2c {-o over2.c over2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node over2.lus {}
-PASS: ./lus2lic {} {-lic -o over3.lic over3.lus}
-PASS: ./lus2lic {-ec -o over3.ec over3.lus}
+PASS: ./lus2lic {} {-lic -o over3.lic over3.lus -n over3}
+PASS: ./lus2lic {-ec -o over3.ec over3.lus -n over3}
 PASS: ./myec2c {-o over3.c over3.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node over3.lus {}
-PASS: ./lus2lic {} {-lic -o overload.lic overload.lus}
-PASS: ./lus2lic {-ec -o overload.ec overload.lus}
+PASS: ./lus2lic {} {-lic -o overload.lic overload.lus -n overload}
+PASS: ./lus2lic {-ec -o overload.ec overload.lus -n overload}
 PASS: ./myec2c {-o overload.c overload.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node overload.lus {}
-PASS: ./lus2lic {} {-lic -o p.lic p.lus}
-PASS: ./lus2lic {-ec -o p.ec p.lus}
+PASS: ./lus2lic {} {-lic -o p.lic p.lus -n p}
+PASS: ./lus2lic {-ec -o p.ec p.lus -n p}
 PASS: ./myec2c {-o p.c p.ec}
-PASS: ./lus2lic {} {-lic -o pack1.lic pack1.lus}
-PASS: ./lus2lic {-ec -o pack1.ec pack1.lus}
+PASS: ./lus2lic {} {-lic -o pack1.lic pack1.lus -n pack1}
+PASS: ./lus2lic {-ec -o pack1.ec pack1.lus -n pack1}
 PASS: ./myec2c {-o pack1.c pack1.ec}
-PASS: ./lus2lic {} {-lic -o packageTableau.lic packageTableau.lus}
-PASS: ./lus2lic {-ec -o packageTableau.ec packageTableau.lus}
+PASS: ./lus2lic {} {-lic -o packageTableau.lic packageTableau.lus -n packageTableau}
+PASS: ./lus2lic {-ec -o packageTableau.ec packageTableau.lus -n packageTableau}
 PASS: ./myec2c {-o packageTableau.c packageTableau.ec}
-PASS: ./lus2lic {} {-lic -o packed_cst.lic packed_cst.lus}
-PASS: ./lus2lic {-ec -o packed_cst.ec packed_cst.lus}
+PASS: ./lus2lic {} {-lic -o packed_cst.lic packed_cst.lus -n packed_cst}
+PASS: ./lus2lic {-ec -o packed_cst.ec packed_cst.lus -n packed_cst}
 PASS: ./myec2c {-o packed_cst.c packed_cst.ec}
-PASS: ./lus2lic {} {-lic -o packs.lic packs.lus}
-PASS: ./lus2lic {-ec -o packs.ec packs.lus}
+PASS: ./lus2lic {} {-lic -o packs.lic packs.lus -n packs}
+PASS: ./lus2lic {-ec -o packs.ec packs.lus -n packs}
 PASS: ./myec2c {-o packs.c packs.ec}
-PASS: ./lus2lic {} {-lic -o param_node.lic param_node.lus}
-PASS: ./lus2lic {-ec -o param_node.ec param_node.lus}
+PASS: ./lus2lic {} {-lic -o param_node.lic param_node.lus -n param_node}
+PASS: ./lus2lic {-ec -o param_node.ec param_node.lus -n param_node}
 PASS: ./myec2c {-o param_node.c param_node.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node param_node.lus {}
-PASS: ./lus2lic {} {-lic -o param_node2.lic param_node2.lus}
-PASS: ./lus2lic {-ec -o param_node2.ec param_node2.lus}
+PASS: ./lus2lic {} {-lic -o param_node2.lic param_node2.lus -n param_node2}
+PASS: ./lus2lic {-ec -o param_node2.ec param_node2.lus -n param_node2}
 PASS: ./myec2c {-o param_node2.c param_node2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node param_node2.lus {}
-PASS: ./lus2lic {} {-lic -o param_node3.lic param_node3.lus}
-PASS: ./lus2lic {-ec -o param_node3.ec param_node3.lus}
+PASS: ./lus2lic {} {-lic -o param_node3.lic param_node3.lus -n param_node3}
+PASS: ./lus2lic {-ec -o param_node3.ec param_node3.lus -n param_node3}
 PASS: ./myec2c {-o param_node3.c param_node3.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node param_node3.lus {}
-PASS: ./lus2lic {} {-lic -o param_node4.lic param_node4.lus}
-PASS: ./lus2lic {-ec -o param_node4.ec param_node4.lus}
+PASS: ./lus2lic {} {-lic -o param_node4.lic param_node4.lus -n param_node4}
+PASS: ./lus2lic {-ec -o param_node4.ec param_node4.lus -n param_node4}
 PASS: ./myec2c {-o param_node4.c param_node4.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node param_node4.lus {}
-PASS: ./lus2lic {} {-lic -o param_struct.lic param_struct.lus}
-PASS: ./lus2lic {-ec -o param_struct.ec param_struct.lus}
+PASS: ./lus2lic {} {-lic -o param_struct.lic param_struct.lus -n param_struct}
+PASS: ./lus2lic {-ec -o param_struct.ec param_struct.lus -n param_struct}
 PASS: ./myec2c {-o param_struct.c param_struct.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node param_struct.lus {}
-PASS: ./lus2lic { --expand-nodes} {-lic -o pilote.lic pilote.lus}
-PASS: ./lus2lic {-ec -o pilote.ec pilote.lus}
+PASS: ./lus2lic { --expand-nodes} {-lic -o pilote.lic pilote.lus -n pilote}
+PASS: ./lus2lic {-ec -o pilote.ec pilote.lus -n pilote}
 PASS: ./myec2c {-o pilote.c pilote.ec}
-PASS: ./lus2lic {} {-lic -o pipeline.lic pipeline.lus}
-PASS: ./lus2lic {-ec -o pipeline.ec pipeline.lus}
+PASS: ./lus2lic {} {-lic -o pipeline.lic pipeline.lus -n pipeline}
+PASS: ./lus2lic {-ec -o pipeline.ec pipeline.lus -n pipeline}
 PASS: ./myec2c {-o pipeline.c pipeline.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node pipeline.lus {}
-PASS: ./lus2lic {} {-lic -o plus.lic plus.lus}
-PASS: ./lus2lic {-ec -o plus.ec plus.lus}
+PASS: ./lus2lic {} {-lic -o plus.lic plus.lus -n plus}
+PASS: ./lus2lic {-ec -o plus.ec plus.lus -n plus}
 PASS: ./myec2c {-o plus.c plus.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node plus.lus {}
-PASS: ./lus2lic {} {-lic -o ply01.lic ply01.lus}
-PASS: ./lus2lic {-ec -o ply01.ec ply01.lus}
+PASS: ./lus2lic {} {-lic -o ply01.lic ply01.lus -n ply01}
+PASS: ./lus2lic {-ec -o ply01.ec ply01.lus -n ply01}
 PASS: ./myec2c {-o ply01.c ply01.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ply01.lus {}
-PASS: ./lus2lic {} {-lic -o ply02.lic ply02.lus}
-PASS: ./lus2lic {-ec -o ply02.ec ply02.lus}
+PASS: ./lus2lic {} {-lic -o ply02.lic ply02.lus -n ply02}
+PASS: ./lus2lic {-ec -o ply02.ec ply02.lus -n ply02}
 PASS: ./myec2c {-o ply02.c ply02.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ply02.lus {}
-PASS: ./lus2lic {} {-lic -o ply03.lic ply03.lus}
-PASS: ./lus2lic {-ec -o ply03.ec ply03.lus}
+PASS: ./lus2lic {} {-lic -o ply03.lic ply03.lus -n ply03}
+PASS: ./lus2lic {-ec -o ply03.ec ply03.lus -n ply03}
 PASS: ./myec2c {-o ply03.c ply03.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ply03.lus {}
-PASS: ./lus2lic {} {-lic -o polymorphic_pack.lic polymorphic_pack.lus}
-PASS: ./lus2lic {-ec -o polymorphic_pack.ec polymorphic_pack.lus}
+PASS: ./lus2lic {} {-lic -o polymorphic_pack.lic polymorphic_pack.lus -n polymorphic_pack}
+PASS: ./lus2lic {-ec -o polymorphic_pack.ec polymorphic_pack.lus -n polymorphic_pack}
 PASS: ./myec2c {-o polymorphic_pack.c polymorphic_pack.ec}
-PASS: ./lus2lic {} {-lic -o poussoir.lic poussoir.lus}
-PASS: ./lus2lic {-ec -o poussoir.ec poussoir.lus}
+PASS: ./lus2lic {} {-lic -o poussoir.lic poussoir.lus -n poussoir}
+PASS: ./lus2lic {-ec -o poussoir.ec poussoir.lus -n poussoir}
 PASS: ./myec2c {-o poussoir.c poussoir.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node poussoir.lus {}
-PASS: ./lus2lic {} {-lic -o pplus.lic pplus.lus}
-PASS: ./lus2lic {-ec -o pplus.ec pplus.lus}
+PASS: ./lus2lic {} {-lic -o pplus.lic pplus.lus -n pplus}
+PASS: ./lus2lic {-ec -o pplus.ec pplus.lus -n pplus}
 PASS: ./myec2c {-o pplus.c pplus.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node pplus.lus {}
-PASS: ./lus2lic {} {-lic -o pre_x.lic pre_x.lus}
-PASS: ./lus2lic {-ec -o pre_x.ec pre_x.lus}
+PASS: ./lus2lic {} {-lic -o pre_x.lic pre_x.lus -n pre_x}
+PASS: ./lus2lic {-ec -o pre_x.ec pre_x.lus -n pre_x}
 PASS: ./myec2c {-o pre_x.c pre_x.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node pre_x.lus {}
-PASS: ./lus2lic {} {-lic -o predef01.lic predef01.lus}
-PASS: ./lus2lic {-ec -o predef01.ec predef01.lus}
+PASS: ./lus2lic {} {-lic -o predef01.lic predef01.lus -n predef01}
+PASS: ./lus2lic {-ec -o predef01.ec predef01.lus -n predef01}
 PASS: ./myec2c {-o predef01.c predef01.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node predef01.lus {}
-PASS: ./lus2lic {} {-lic -o predef02.lic predef02.lus}
-PASS: ./lus2lic {-ec -o predef02.ec predef02.lus}
+PASS: ./lus2lic {} {-lic -o predef02.lic predef02.lus -n predef02}
+PASS: ./lus2lic {-ec -o predef02.ec predef02.lus -n predef02}
 PASS: ./myec2c {-o predef02.c predef02.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node predef02.lus {}
-PASS: ./lus2lic {} {-lic -o predef03.lic predef03.lus}
-PASS: ./lus2lic {-ec -o predef03.ec predef03.lus}
+PASS: ./lus2lic {} {-lic -o predef03.lic predef03.lus -n predef03}
+PASS: ./lus2lic {-ec -o predef03.ec predef03.lus -n predef03}
 PASS: ./myec2c {-o predef03.c predef03.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node predef03.lus {}
-PASS: ./lus2lic {} {-lic -o predefOp.lic predefOp.lus}
-PASS: ./lus2lic {-ec -o predefOp.ec predefOp.lus}
+PASS: ./lus2lic {} {-lic -o predefOp.lic predefOp.lus -n predefOp}
+PASS: ./lus2lic {-ec -o predefOp.ec predefOp.lus -n predefOp}
 PASS: ./myec2c {-o predefOp.c predefOp.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node predefOp.lus {}
-PASS: ./lus2lic {} {-lic -o produitBool.lic produitBool.lus}
-PASS: ./lus2lic {-ec -o produitBool.ec produitBool.lus}
+PASS: ./lus2lic {} {-lic -o produitBool.lic produitBool.lus -n produitBool}
+PASS: ./lus2lic {-ec -o produitBool.ec produitBool.lus -n produitBool}
 PASS: ./myec2c {-o produitBool.c produitBool.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node produitBool.lus {}
-PASS: ./lus2lic {} {-lic -o real_ex.lic real_ex.lus}
-PASS: ./lus2lic {-ec -o real_ex.ec real_ex.lus}
+PASS: ./lus2lic {} {-lic -o real_ex.lic real_ex.lus -n real_ex}
+PASS: ./lus2lic {-ec -o real_ex.ec real_ex.lus -n real_ex}
 PASS: ./myec2c {-o real_ex.c real_ex.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node real_ex.lus {}
-PASS: ./lus2lic {} {-lic -o redIf.lic redIf.lus}
-PASS: ./lus2lic {-ec -o redIf.ec redIf.lus}
+PASS: ./lus2lic {} {-lic -o redIf.lic redIf.lus -n redIf}
+PASS: ./lus2lic {-ec -o redIf.ec redIf.lus -n redIf}
 PASS: ./myec2c {-o redIf.c redIf.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node redIf.lus {}
-PASS: ./lus2lic {} {-lic -o rediter.lic rediter.lus}
-PASS: ./lus2lic {-ec -o rediter.ec rediter.lus}
+PASS: ./lus2lic {} {-lic -o rediter.lic rediter.lus -n rediter}
+PASS: ./lus2lic {-ec -o rediter.ec rediter.lus -n rediter}
 PASS: ./myec2c {-o rediter.c rediter.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node rediter.lus {}
-PASS: ./lus2lic {} {-lic -o redoptest.lic redoptest.lus}
-PASS: ./lus2lic {-ec -o redoptest.ec redoptest.lus}
+PASS: ./lus2lic {} {-lic -o redoptest.lic redoptest.lus -n redoptest}
+PASS: ./lus2lic {-ec -o redoptest.ec redoptest.lus -n redoptest}
 PASS: ./myec2c {-o redoptest.c redoptest.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node redoptest.lus {}
-PASS: ./lus2lic {} {-lic -o remplissage.lic remplissage.lus}
-PASS: ./lus2lic {-ec -o remplissage.ec remplissage.lus}
+PASS: ./lus2lic {} {-lic -o remplissage.lic remplissage.lus -n remplissage}
+PASS: ./lus2lic {-ec -o remplissage.ec remplissage.lus -n remplissage}
 PASS: ./myec2c {-o remplissage.c remplissage.ec}
-PASS: ./lus2lic {} {-lic -o rs.lic rs.lus}
-PASS: ./lus2lic {-ec -o rs.ec rs.lus}
+PASS: ./lus2lic {} {-lic -o rs.lic rs.lus -n rs}
+PASS: ./lus2lic {-ec -o rs.ec rs.lus -n rs}
 PASS: ./myec2c {-o rs.c rs.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node rs.lus {}
-PASS: ./lus2lic {} {-lic -o sample_time_change.lic sample_time_change.lus}
-PASS: ./lus2lic {-ec -o sample_time_change.ec sample_time_change.lus}
+PASS: ./lus2lic {} {-lic -o sample_time_change.lic sample_time_change.lus -n sample_time_change}
+PASS: ./lus2lic {-ec -o sample_time_change.ec sample_time_change.lus -n sample_time_change}
 PASS: ./myec2c {-o sample_time_change.c sample_time_change.ec}
 FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node sample_time_change.lus {}
-PASS: ./lus2lic {} {-lic -o sample_time_change_MainNode.lic sample_time_change_MainNode.lus}
-PASS: ./lus2lic {-ec -o sample_time_change_MainNode.ec sample_time_change_MainNode.lus}
+PASS: ./lus2lic {} {-lic -o sample_time_change_MainNode.lic sample_time_change_MainNode.lus -n sample_time_change_MainNode}
+PASS: ./lus2lic {-ec -o sample_time_change_MainNode.ec sample_time_change_MainNode.lus -n sample_time_change_MainNode}
 PASS: ./myec2c {-o sample_time_change_MainNode.c sample_time_change_MainNode.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node sample_time_change_MainNode.lus {}
-PASS: ./lus2lic {} {-lic -o shiftFill_ludic.lic shiftFill_ludic.lus}
-PASS: ./lus2lic {-ec -o shiftFill_ludic.ec shiftFill_ludic.lus}
+PASS: ./lus2lic {} {-lic -o shiftFill_ludic.lic shiftFill_ludic.lus -n shiftFill_ludic}
+PASS: ./lus2lic {-ec -o shiftFill_ludic.ec shiftFill_ludic.lus -n shiftFill_ludic}
 PASS: ./myec2c {-o shiftFill_ludic.c shiftFill_ludic.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node shiftFill_ludic.lus {}
-PASS: ./lus2lic {} {-lic -o shift_ludic.lic shift_ludic.lus}
-PASS: ./lus2lic {-ec -o shift_ludic.ec shift_ludic.lus}
+PASS: ./lus2lic {} {-lic -o shift_ludic.lic shift_ludic.lus -n shift_ludic}
+PASS: ./lus2lic {-ec -o shift_ludic.ec shift_ludic.lus -n shift_ludic}
 PASS: ./myec2c {-o shift_ludic.c shift_ludic.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node shift_ludic.lus {}
-PASS: ./lus2lic {} {-lic -o simple.lic simple.lus}
-PASS: ./lus2lic {-ec -o simple.ec simple.lus}
+PASS: ./lus2lic {} {-lic -o simple.lic simple.lus -n simple}
+PASS: ./lus2lic {-ec -o simple.ec simple.lus -n simple}
 PASS: ./myec2c {-o simple.c simple.ec}
-PASS: ./lus2lic {} {-lic -o simpleRed.lic simpleRed.lus}
-PASS: ./lus2lic {-ec -o simpleRed.ec simpleRed.lus}
+PASS: ./lus2lic {} {-lic -o simpleRed.lic simpleRed.lus -n simpleRed}
+PASS: ./lus2lic {-ec -o simpleRed.ec simpleRed.lus -n simpleRed}
 PASS: ./myec2c {-o simpleRed.c simpleRed.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node simpleRed.lus {}
-PASS: ./lus2lic {} {-lic -o sincos.lic sincos.lus}
-PASS: ./lus2lic {-ec -o sincos.ec sincos.lus}
+PASS: ./lus2lic {} {-lic -o sincos.lic sincos.lus -n sincos}
+PASS: ./lus2lic {-ec -o sincos.ec sincos.lus -n sincos}
 PASS: ./myec2c {-o sincos.c sincos.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node sincos.lus {}
-PASS: ./lus2lic { --expand-nodes} {-lic -o speedcontrol.lic speedcontrol.lus}
-PASS: ./lus2lic {-ec -o speedcontrol.ec speedcontrol.lus}
+PASS: ./lus2lic { --expand-nodes} {-lic -o speedcontrol.lic speedcontrol.lus -n speedcontrol}
+PASS: ./lus2lic {-ec -o speedcontrol.ec speedcontrol.lus -n speedcontrol}
 PASS: ./myec2c {-o speedcontrol.c speedcontrol.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node speedcontrol.lus { --expand-nodes}
-PASS: ./lus2lic {} {-lic -o sqrt.lic sqrt.lus}
-PASS: ./lus2lic {-ec -o sqrt.ec sqrt.lus}
-PASS: ./myec2c {-o sqrt.c sqrt.ec}
-PASS: ./lus2lic {} {-lic -o stopwatch.lic stopwatch.lus}
-PASS: ./lus2lic {-ec -o stopwatch.ec stopwatch.lus}
+PASS: ./lus2lic {} {-lic -o stopwatch.lic stopwatch.lus -n stopwatch}
+PASS: ./lus2lic {-ec -o stopwatch.ec stopwatch.lus -n stopwatch}
 PASS: ./myec2c {-o stopwatch.c stopwatch.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node stopwatch.lus {}
-PASS: ./lus2lic {} {-lic -o struct0.lic struct0.lus}
-PASS: ./lus2lic {-ec -o struct0.ec struct0.lus}
+PASS: ./lus2lic {} {-lic -o struct0.lic struct0.lus -n struct0}
+PASS: ./lus2lic {-ec -o struct0.ec struct0.lus -n struct0}
 PASS: ./myec2c {-o struct0.c struct0.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node struct0.lus {}
-PASS: ./lus2lic {} {-lic -o struct_equality.lic struct_equality.lus}
-PASS: ./lus2lic {-ec -o struct_equality.ec struct_equality.lus}
+PASS: ./lus2lic {} {-lic -o struct_equality.lic struct_equality.lus -n struct_equality}
+PASS: ./lus2lic {-ec -o struct_equality.ec struct_equality.lus -n struct_equality}
 PASS: ./myec2c {-o struct_equality.c struct_equality.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node struct_equality.lus {}
-PASS: ./lus2lic {} {-lic -o struct_with.lic struct_with.lus}
-PASS: ./lus2lic {-ec -o struct_with.ec struct_with.lus}
+PASS: ./lus2lic {} {-lic -o struct_with.lic struct_with.lus -n struct_with}
+PASS: ./lus2lic {-ec -o struct_with.ec struct_with.lus -n struct_with}
 PASS: ./myec2c {-o struct_with.c struct_with.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node struct_with.lus {}
-PASS: ./lus2lic {} {-lic -o t0.lic t0.lus}
-PASS: ./lus2lic {-ec -o t0.ec t0.lus}
+PASS: ./lus2lic {} {-lic -o t0.lic t0.lus -n t0}
+PASS: ./lus2lic {-ec -o t0.ec t0.lus -n t0}
 PASS: ./myec2c {-o t0.c t0.ec}
-PASS: ./lus2lic {} {-lic -o t1.lic t1.lus}
-PASS: ./lus2lic {-ec -o t1.ec t1.lus}
+PASS: ./lus2lic {} {-lic -o t1.lic t1.lus -n t1}
+PASS: ./lus2lic {-ec -o t1.ec t1.lus -n t1}
 PASS: ./myec2c {-o t1.c t1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node t1.lus {}
-PASS: ./lus2lic {} {-lic -o t2.lic t2.lus}
-PASS: ./lus2lic {-ec -o t2.ec t2.lus}
+PASS: ./lus2lic {} {-lic -o t2.lic t2.lus -n t2}
+PASS: ./lus2lic {-ec -o t2.ec t2.lus -n t2}
 PASS: ./myec2c {-o t2.c t2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node t2.lus {}
-PASS: ./lus2lic {} {-lic -o test.lic test.lus}
-PASS: ./lus2lic {-ec -o test.ec test.lus}
+PASS: ./lus2lic {} {-lic -o test.lic test.lus -n test}
+PASS: ./lus2lic {-ec -o test.ec test.lus -n test}
 PASS: ./myec2c {-o test.c test.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test.lus {}
-PASS: ./lus2lic {} {-lic -o testBoite.lic testBoite.lus}
-PASS: ./lus2lic {-ec -o testBoite.ec testBoite.lus}
+PASS: ./lus2lic {} {-lic -o testBoite.lic testBoite.lus -n testBoite}
+PASS: ./lus2lic {-ec -o testBoite.ec testBoite.lus -n testBoite}
 PASS: ./myec2c {-o testBoite.c testBoite.ec}
-PASS: ./lus2lic {} {-lic -o testCA.lic testCA.lus}
-PASS: ./lus2lic {-ec -o testCA.ec testCA.lus}
+PASS: ./lus2lic {} {-lic -o testCA.lic testCA.lus -n testCA}
+PASS: ./lus2lic {-ec -o testCA.ec testCA.lus -n testCA}
 PASS: ./myec2c {-o testCA.c testCA.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node testCA.lus {}
-PASS: ./lus2lic {} {-lic -o testCapt.lic testCapt.lus}
-PASS: ./lus2lic {-ec -o testCapt.ec testCapt.lus}
+PASS: ./lus2lic {} {-lic -o testCapt.lic testCapt.lus -n testCapt}
+PASS: ./lus2lic {-ec -o testCapt.ec testCapt.lus -n testCapt}
 PASS: ./myec2c {-o testCapt.c testCapt.ec}
-PASS: ./lus2lic {} {-lic -o testPilote.lic testPilote.lus}
-PASS: ./lus2lic {-ec -o testPilote.ec testPilote.lus}
+PASS: ./lus2lic {} {-lic -o testPilote.lic testPilote.lus -n testPilote}
+PASS: ./lus2lic {-ec -o testPilote.ec testPilote.lus -n testPilote}
 PASS: ./myec2c {-o testPilote.c testPilote.ec}
-PASS: ./lus2lic {} {-lic -o test_Int.lic test_Int.lus}
-PASS: ./lus2lic {-ec -o test_Int.ec test_Int.lus}
+PASS: ./lus2lic {} {-lic -o test_Int.lic test_Int.lus -n test_Int}
+PASS: ./lus2lic {-ec -o test_Int.ec test_Int.lus -n test_Int}
 PASS: ./myec2c {-o test_Int.c test_Int.ec}
-PASS: ./lus2lic {} {-lic -o test_arrow.lic test_arrow.lus}
-PASS: ./lus2lic {-ec -o test_arrow.ec test_arrow.lus}
+PASS: ./lus2lic {} {-lic -o test_arrow.lic test_arrow.lus -n test_arrow}
+PASS: ./lus2lic {-ec -o test_arrow.ec test_arrow.lus -n test_arrow}
 PASS: ./myec2c {-o test_arrow.c test_arrow.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_arrow.lus {}
-PASS: ./lus2lic {} {-lic -o test_boolred.lic test_boolred.lus}
-PASS: ./lus2lic {-ec -o test_boolred.ec test_boolred.lus}
+PASS: ./lus2lic {} {-lic -o test_boolred.lic test_boolred.lus -n test_boolred}
+PASS: ./lus2lic {-ec -o test_boolred.ec test_boolred.lus -n test_boolred}
 PASS: ./myec2c {-o test_boolred.c test_boolred.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_boolred.lus {}
-PASS: ./lus2lic {} {-lic -o test_clash.lic test_clash.lus}
-PASS: ./lus2lic {-ec -o test_clash.ec test_clash.lus}
+PASS: ./lus2lic {} {-lic -o test_clash.lic test_clash.lus -n test_clash}
+PASS: ./lus2lic {-ec -o test_clash.ec test_clash.lus -n test_clash}
 PASS: ./myec2c {-o test_clash.c test_clash.ec}
-PASS: ./lus2lic {} {-lic -o test_condact.lic test_condact.lus}
-PASS: ./lus2lic {-ec -o test_condact.ec test_condact.lus}
+PASS: ./lus2lic {} {-lic -o test_condact.lic test_condact.lus -n test_condact}
+PASS: ./lus2lic {-ec -o test_condact.ec test_condact.lus -n test_condact}
 PASS: ./myec2c {-o test_condact.c test_condact.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_condact.lus {}
-PASS: ./lus2lic {} {-lic -o test_const.lic test_const.lus}
-PASS: ./lus2lic {-ec -o test_const.ec test_const.lus}
+PASS: ./lus2lic {} {-lic -o test_const.lic test_const.lus -n test_const}
+PASS: ./lus2lic {-ec -o test_const.ec test_const.lus -n test_const}
 PASS: ./myec2c {-o test_const.c test_const.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_const.lus {}
-PASS: ./lus2lic {} {-lic -o test_diese.lic test_diese.lus}
-PASS: ./lus2lic {-ec -o test_diese.ec test_diese.lus}
+PASS: ./lus2lic {} {-lic -o test_diese.lic test_diese.lus -n test_diese}
+PASS: ./lus2lic {-ec -o test_diese.ec test_diese.lus -n test_diese}
 PASS: ./myec2c {-o test_diese.c test_diese.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_diese.lus {}
-PASS: ./lus2lic {} {-lic -o test_enum.lic test_enum.lus}
-PASS: ./lus2lic {-ec -o test_enum.ec test_enum.lus}
+PASS: ./lus2lic {} {-lic -o test_enum.lic test_enum.lus -n test_enum}
+PASS: ./lus2lic {-ec -o test_enum.ec test_enum.lus -n test_enum}
 PASS: ./myec2c {-o test_enum.c test_enum.ec}
-PASS: ./lus2lic {} {-lic -o test_extern.lic test_extern.lus}
-PASS: ./lus2lic {-ec -o test_extern.ec test_extern.lus}
+PASS: ./lus2lic {} {-lic -o test_extern.lic test_extern.lus -n test_extern}
+PASS: ./lus2lic {-ec -o test_extern.ec test_extern.lus -n test_extern}
 PASS: ./myec2c {-o test_extern.c test_extern.ec}
-PASS: ./lus2lic {} {-lic -o test_lustre.lic test_lustre.lus}
-PASS: ./lus2lic {-ec -o test_lustre.ec test_lustre.lus}
+PASS: ./lus2lic {} {-lic -o test_lustre.lic test_lustre.lus -n test_lustre}
+PASS: ./lus2lic {-ec -o test_lustre.ec test_lustre.lus -n test_lustre}
 PASS: ./myec2c {-o test_lustre.c test_lustre.ec}
-PASS: ./lus2lic {} {-lic -o test_map.lic test_map.lus}
-PASS: ./lus2lic {-ec -o test_map.ec test_map.lus}
+PASS: ./lus2lic {} {-lic -o test_map.lic test_map.lus -n test_map}
+PASS: ./lus2lic {-ec -o test_map.ec test_map.lus -n test_map}
 PASS: ./myec2c {-o test_map.c test_map.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_map.lus {}
-PASS: ./lus2lic {} {-lic -o test_merge.lic test_merge.lus}
-PASS: ./lus2lic {-ec -o test_merge.ec test_merge.lus}
-PASS: ./lus2lic {} {-lic -o test_model.lic test_model.lus}
-PASS: ./lus2lic {-ec -o test_model.ec test_model.lus}
+PASS: ./lus2lic {} {-lic -o test_merge.lic test_merge.lus -n test_merge}
+PASS: ./lus2lic {-ec -o test_merge.ec test_merge.lus -n test_merge}
+PASS: ./lus2lic {} {-lic -o test_model.lic test_model.lus -n test_model}
+PASS: ./lus2lic {-ec -o test_model.ec test_model.lus -n test_model}
 PASS: ./myec2c {-o test_model.c test_model.ec}
-FAIL: without any option: ./lus2lic {} {-lic -o test_model2.lic test_model2.lus}
-PASS: ./lus2lic {} {-lic -o test_node_expand.lic test_node_expand.lus}
-PASS: ./lus2lic {-ec -o test_node_expand.ec test_node_expand.lus}
+FAIL: without any option: ./lus2lic {} {-lic -o test_model2.lic test_model2.lus -n test_model2}
+PASS: ./lus2lic {} {-lic -o test_node_expand.lic test_node_expand.lus -n test_node_expand}
+PASS: ./lus2lic {-ec -o test_node_expand.ec test_node_expand.lus -n test_node_expand}
 PASS: ./myec2c {-o test_node_expand.c test_node_expand.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_node_expand.lus {}
-PASS: ./lus2lic {} {-lic -o test_node_expand2.lic test_node_expand2.lus}
-PASS: ./lus2lic {-ec -o test_node_expand2.ec test_node_expand2.lus}
+PASS: ./lus2lic {} {-lic -o test_node_expand2.lic test_node_expand2.lus -n test_node_expand2}
+PASS: ./lus2lic {-ec -o test_node_expand2.ec test_node_expand2.lus -n test_node_expand2}
 PASS: ./myec2c {-o test_node_expand2.c test_node_expand2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_node_expand2.lus {}
-PASS: ./lus2lic {} {-lic -o test_poly.lic test_poly.lus}
-PASS: ./lus2lic {-ec -o test_poly.ec test_poly.lus}
+PASS: ./lus2lic {} {-lic -o test_poly.lic test_poly.lus -n test_poly}
+PASS: ./lus2lic {-ec -o test_poly.ec test_poly.lus -n test_poly}
 PASS: ./myec2c {-o test_poly.c test_poly.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_poly.lus {}
-PASS: ./lus2lic {} {-lic -o test_struct.lic test_struct.lus}
-PASS: ./lus2lic {-ec -o test_struct.ec test_struct.lus}
+PASS: ./lus2lic {} {-lic -o test_sqrt.lic test_sqrt.lus -n test_sqrt}
+PASS: ./lus2lic {-ec -o test_sqrt.ec test_sqrt.lus -n test_sqrt}
+PASS: ./myec2c {-o test_sqrt.c test_sqrt.ec}
+PASS: ./lus2lic {} {-lic -o test_struct.lic test_struct.lus -n test_struct}
+PASS: ./lus2lic {-ec -o test_struct.ec test_struct.lus -n test_struct}
 PASS: ./myec2c {-o test_struct.c test_struct.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node test_struct.lus {}
-PASS: ./lus2lic {} {-lic -o titi.lic titi.lus}
-PASS: ./lus2lic {-ec -o titi.ec titi.lus}
+PASS: ./lus2lic {} {-lic -o titi.lic titi.lus -n titi}
+PASS: ./lus2lic {-ec -o titi.ec titi.lus -n titi}
 PASS: ./myec2c {-o titi.c titi.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node titi.lus {}
-PASS: ./lus2lic {} {-lic -o toolate.lic toolate.lus}
-PASS: ./lus2lic {-ec -o toolate.ec toolate.lus}
+PASS: ./lus2lic {} {-lic -o toolate.lic toolate.lus -n toolate}
+PASS: ./lus2lic {-ec -o toolate.ec toolate.lus -n toolate}
 PASS: ./myec2c {-o toolate.c toolate.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node toolate.lus {}
-PASS: ./lus2lic {} {-lic -o toto.lic toto.lus}
-PASS: ./lus2lic {-ec -o toto.ec toto.lus}
+PASS: ./lus2lic {} {-lic -o toto.lic toto.lus -n toto}
+PASS: ./lus2lic {-ec -o toto.ec toto.lus -n toto}
 PASS: ./myec2c {-o toto.c toto.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node toto.lus {}
-FAIL: without any option: ./lus2lic {} {-lic -o tranche.lic tranche.lus}
-PASS: ./lus2lic {} {-lic -o tri.lic tri.lus}
-PASS: ./lus2lic {-ec -o tri.ec tri.lus}
+PASS: ./lus2lic {} {-lic -o tranche.lic tranche.lus -n tranche}
+PASS: ./lus2lic {-ec -o tranche.ec tranche.lus -n tranche}
+PASS: ./myec2c {-o tranche.c tranche.ec}
+PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node tranche.lus {}
+PASS: ./lus2lic {} {-lic -o tri.lic tri.lus -n tri}
+PASS: ./lus2lic {-ec -o tri.ec tri.lus -n tri}
 PASS: ./myec2c {-o tri.c tri.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node tri.lus {}
-PASS: ./lus2lic {} {-lic -o triSel.lic triSel.lus}
-PASS: ./lus2lic {-ec -o triSel.ec triSel.lus}
+PASS: ./lus2lic {} {-lic -o triSel.lic triSel.lus -n triSel}
+PASS: ./lus2lic {-ec -o triSel.ec triSel.lus -n triSel}
 PASS: ./myec2c {-o triSel.c triSel.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node triSel.lus {}
-PASS: ./lus2lic {} {-lic -o trivial.lic trivial.lus}
-PASS: ./lus2lic {-ec -o trivial.ec trivial.lus}
+PASS: ./lus2lic {} {-lic -o trivial.lic trivial.lus -n trivial}
+PASS: ./lus2lic {-ec -o trivial.ec trivial.lus -n trivial}
 PASS: ./myec2c {-o trivial.c trivial.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node trivial.lus {}
-PASS: ./lus2lic {} {-lic -o trivial2.lic trivial2.lus}
-PASS: ./lus2lic {-ec -o trivial2.ec trivial2.lus}
+PASS: ./lus2lic {} {-lic -o trivial2.lic trivial2.lus -n trivial2}
+PASS: ./lus2lic {-ec -o trivial2.ec trivial2.lus -n trivial2}
 PASS: ./myec2c {-o trivial2.c trivial2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node trivial2.lus {}
-PASS: ./lus2lic {} {-lic -o trivial_array.lic trivial_array.lus}
-PASS: ./lus2lic {-ec -o trivial_array.ec trivial_array.lus}
+PASS: ./lus2lic {} {-lic -o trivial_array.lic trivial_array.lus -n trivial_array}
+PASS: ./lus2lic {-ec -o trivial_array.ec trivial_array.lus -n trivial_array}
 PASS: ./myec2c {-o trivial_array.c trivial_array.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node trivial_array.lus {}
-PASS: ./lus2lic {} {-lic -o ts01.lic ts01.lus}
-PASS: ./lus2lic {-ec -o ts01.ec ts01.lus}
+PASS: ./lus2lic {} {-lic -o ts01.lic ts01.lus -n ts01}
+PASS: ./lus2lic {-ec -o ts01.ec ts01.lus -n ts01}
 PASS: ./myec2c {-o ts01.c ts01.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ts01.lus {}
-PASS: ./lus2lic {} {-lic -o ts04.lic ts04.lus}
-PASS: ./lus2lic {-ec -o ts04.ec ts04.lus}
+PASS: ./lus2lic {} {-lic -o ts04.lic ts04.lus -n ts04}
+PASS: ./lus2lic {-ec -o ts04.ec ts04.lus -n ts04}
 PASS: ./myec2c {-o ts04.c ts04.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node ts04.lus {}
-PASS: ./lus2lic {} {-lic -o tuple.lic tuple.lus}
-PASS: ./lus2lic {-ec -o tuple.ec tuple.lus}
+PASS: ./lus2lic {} {-lic -o tuple.lic tuple.lus -n tuple}
+PASS: ./lus2lic {-ec -o tuple.ec tuple.lus -n tuple}
 PASS: ./myec2c {-o tuple.c tuple.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node tuple.lus {}
-PASS: ./lus2lic {} {-lic -o type_decl.lic type_decl.lus}
-PASS: ./lus2lic {-ec -o type_decl.ec type_decl.lus}
+PASS: ./lus2lic {} {-lic -o type_decl.lic type_decl.lus -n type_decl}
+PASS: ./lus2lic {-ec -o type_decl.ec type_decl.lus -n type_decl}
 PASS: ./myec2c {-o type_decl.c type_decl.ec}
-PASS: ./lus2lic {} {-lic -o uu.lic uu.lus}
-PASS: ./lus2lic {-ec -o uu.ec uu.lus}
+PASS: ./lus2lic {} {-lic -o uu.lic uu.lus -n uu}
+PASS: ./lus2lic {-ec -o uu.ec uu.lus -n uu}
 PASS: ./myec2c {-o uu.c uu.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node uu.lus {}
-PASS: ./lus2lic {} {-lic -o v1.lic v1.lus}
-PASS: ./lus2lic {-ec -o v1.ec v1.lus}
+PASS: ./lus2lic {} {-lic -o v1.lic v1.lus -n v1}
+PASS: ./lus2lic {-ec -o v1.ec v1.lus -n v1}
 PASS: ./myec2c {-o v1.c v1.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node v1.lus {}
-PASS: ./lus2lic {} {-lic -o when_tuple.lic when_tuple.lus}
-PASS: ./lus2lic {-ec -o when_tuple.ec when_tuple.lus}
+PASS: ./lus2lic {} {-lic -o when_tuple.lic when_tuple.lus -n when_tuple}
+PASS: ./lus2lic {-ec -o when_tuple.ec when_tuple.lus -n when_tuple}
 PASS: ./myec2c {-o when_tuple.c when_tuple.ec}
-PASS: ./lus2lic {} {-lic -o xx.lic xx.lus}
-PASS: ./lus2lic {-ec -o xx.ec xx.lus}
+PASS: ./lus2lic {} {-lic -o xx.lic xx.lus -n xx}
+PASS: ./lus2lic {-ec -o xx.ec xx.lus -n xx}
 PASS: ./myec2c {-o xx.c xx.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node xx.lus {}
-PASS: ./lus2lic {} {-lic -o yyy.lic yyy.lus}
-PASS: ./lus2lic {-ec -o yyy.ec yyy.lus}
+PASS: ./lus2lic {} {-lic -o yyy.lic yyy.lus -n yyy}
+PASS: ./lus2lic {-ec -o yyy.ec yyy.lus -n yyy}
 PASS: ./myec2c {-o yyy.c yyy.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node yyy.lus {}
-PASS: ./lus2lic {} {-lic -o zzz.lic zzz.lus}
-PASS: ./lus2lic {-ec -o zzz.ec zzz.lus}
+PASS: ./lus2lic {} {-lic -o zzz.lic zzz.lus -n zzz}
+PASS: ./lus2lic {-ec -o zzz.ec zzz.lus -n zzz}
 PASS: ./myec2c {-o zzz.c zzz.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz.lus {}
-PASS: ./lus2lic {} {-lic -o zzz2.lic zzz2.lus}
-PASS: ./lus2lic {-ec -o zzz2.ec zzz2.lus}
+PASS: ./lus2lic {} {-lic -o zzz2.lic zzz2.lus -n zzz2}
+PASS: ./lus2lic {-ec -o zzz2.ec zzz2.lus -n zzz2}
 PASS: ./myec2c {-o zzz2.c zzz2.ec}
 PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 ==> lus2lic0.sum <==
@@ -1755,42 +1759,42 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
 # of expected failures		54
 
 ==> lus2lic1.sum <==
+PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus 33749 {}
 
 		=== lus2lic1 Summary ===
 
-# of expected passes		333
-# of unexpected failures	1
+# of expected passes		336
 
 ==> lus2lic2.sum <==
 
 		=== lus2lic2 Summary ===
 
-# of expected passes		326
-# of unexpected failures	2
+# of expected passes		327
+# of unexpected failures	1
 
 ==> lus2lic3.sum <==
 		=== lus2lic3 Summary ===
 
-# of expected passes		495
-# of unexpected failures	5
+# of expected passes		497
+# of unexpected failures	3
 # of unresolved testcases	1
 
 ==> lus2lic4.sum <==
 
 		=== lus2lic4 Summary ===
 
-# of expected passes		464
-# of unexpected failures	7
+# of expected passes		468
+# of unexpected failures	6
 ===============================
-# Total number of failures: 15
+# Total number of failures: 10
 lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 28 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 34 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 41 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 18 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 34 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 40 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 46 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 26 seconds
 * Ref time: 
-66.86user 22.59system 2:01.44elapsed 73%CPU (0avgtext+0avgdata 283984maxresident)k
-0inputs+142256outputs (0major+11205615minor)pagefaults 0swaps
+86.77user 27.75system 2:26.54elapsed 78%CPU (0avgtext+0avgdata 284268maxresident)k
+0inputs+146792outputs (0major+11400569minor)pagefaults 0swaps
 * Quick time (-j 4):
-76.54user 24.41system 1:18.16elapsed 129%CPU (0avgtext+0avgdata 282848maxresident)k
-0inputs+141112outputs (0major+11127257minor)pagefaults 0swaps
+107.58user 29.57system 1:26.81elapsed 157%CPU (0avgtext+0avgdata 282988maxresident)k
+0inputs+141688outputs (0major+11114687minor)pagefaults 0swaps
diff --git a/test/lus2lic.tests/non-reg.exp b/test/lus2lic.tests/non-reg.exp
index 846ba5c0..5a17f414 100644
--- a/test/lus2lic.tests/non-reg.exp
+++ b/test/lus2lic.tests/non-reg.exp
@@ -15,14 +15,14 @@ foreach f $ok_files {
     set bf $tmp[file tail $basef]
     set basef [file tail $basef]
 
-    set id1 [should_work "without any option" "$lus2lic -lic" "-o $bf.lic $bf"]
+    set id1 [should_work "without any option" "$lus2lic -lic" "-o $bf.lic $bf -n $basef"]
     wait -i $id1
     # if { [nonemptyfile "$bf.lic"] } {
-        set id2 [should_work "Generate ec code  " "$lus2lic" "-ec -o $bf.ec $f"]
+        set id2 [should_work "Generate ec code  " "$lus2lic" "-ec -o $bf.ec $f -n $basef"]
         wait -i $id2
         
         if { [nonemptyfile "$bf.ec"] } {
-            set id3 [should_work "Try ec2c on the result" "$ec2c" "-o $bf.c $bf.ec"]
+            set id3 [should_work "Try ec2c on the result" "$ec2c" "-o $bf.c $bf.ec -n $basef"]
             wait -i $id3
             catch { exp_close -i $id3 }
         catch { exp_wait  -i $id3 } output
diff --git a/test/lus2lic.tests/progression.exp b/test/lus2lic.tests/progression.exp
index 684b10e7..c20aee32 100644
--- a/test/lus2lic.tests/progression.exp
+++ b/test/lus2lic.tests/progression.exp
@@ -12,9 +12,11 @@ set files [lsort [glob  -nocomplain should_work/broken/*.lus]]
 
 foreach f $files {
     set bf [file rootname $f]
+    set basef [file tail $bf]
     set bf $tmp[file tail $bf]
-    should_work "without any option" "$lus2lic" "    -o $bf.out $f"
-    should_work "Generate ec code  " "$lus2lic" "-ec -o $bf.ec  $f"
+
+    should_work "without any option" "$lus2lic" "    -o $bf.out $f -n $basef"
+    should_work "Generate ec code  " "$lus2lic" "-ec -o $bf.ec  $f -n $basef"
 }
 
 
@@ -26,7 +28,7 @@ proc iter_should_fail { fail_kind } {
     foreach f $files {
         set bf [file rootname $f]
         set bf $tmp[file tail $bf]
-        should_fail "Test bad programs" "$fail_kind" "$lus2lic -lic" "-o $bf.lic $f"
+        should_fail "Test bad programs" "$fail_kind" "$lus2lic -lic" "-o $bf.lic $f -n $basef"
     }
 }
 
diff --git a/test/should_work/cond01.lus b/test/should_work/cond01.lus
index a9c35488..4d3fc0be 100644
--- a/test/should_work/cond01.lus
+++ b/test/should_work/cond01.lus
@@ -2,5 +2,5 @@
 
 node cond01(c: bool; x,y:int) returns (o: int);
 let
-	o = condact<<+,0>>(c,x,y);
+	o = condact<<Lustre::iplus,0>>(c,x,y);
 tel
diff --git a/test/should_work/decl.lus b/test/should_work/decl.lus
index bec87709..118bc6f7 100644
--- a/test/should_work/decl.lus
+++ b/test/should_work/decl.lus
@@ -23,12 +23,12 @@ type
 ---------------------------------
 -- noeuds et fonctions externes : 
 ---------------------------------
-extern node decl(a1, b1, c1: t1) returns (d1: bool);
+extern node decl2(a1, b1, c1: t1) returns (d1: bool);
 extern node n2(a1, b1, c1: t4; d1: bool) returns (e1: t5);
 extern function f1(a1, b1, c1: couleur) returns (d1: bool^h) ;
 
 
-node dummy(y: bool) returns(x: bool);
+node decl(y: bool) returns(x: bool);
 let
   x=true;
 tel
diff --git a/test/should_work/iter.lus b/test/should_work/iter.lus
index c1412fde..bb7739da 100644
--- a/test/should_work/iter.lus
+++ b/test/should_work/iter.lus
@@ -7,7 +7,7 @@ var
 let
 	bidon, T_inter = fill<<filled,n>>(init);
 	Tab_out = map<<mapped,n>>(T_inter);
-	Red_plus = red<<plus,n>>(-100, Tab_out);
+	Red_plus = red<<Lustre::plus,n>>(-100, Tab_out);
 
 	zorroAcc, zorroTab = fillred<<garcia,5>>(0,[0,0,0,0,0]);
 tel
diff --git a/test/should_work/pilote.lus b/test/should_work/pilote.lus
index 6e466579..6923db2c 100644
--- a/test/should_work/pilote.lus
+++ b/test/should_work/pilote.lus
@@ -290,7 +290,8 @@ node pilote(in : bool) returns (v : bool;
 
 body
 
-node pilote (in : bool) 
+-- XXX there is a loop in this program!!
+node pilote2 (in : bool) 
 returns (v : bool;
          dataBoiteCP_IN, dataBoiteCP_OUT : int;
          piloteData, readData : int;
@@ -593,7 +594,7 @@ let
 tel
 
 
-node pilote2(Hpilote, semAutP : bool; 
+node pilote(Hpilote, semAutP : bool; 
             dataBoiteCP : int) 
 returns (semMemTakeP, putMemP, dataGET : bool; 
          piloteData : int;
diff --git a/test/should_work/sqrt.lus b/test/should_work/test_sqrt.lus
similarity index 100%
rename from test/should_work/sqrt.lus
rename to test/should_work/test_sqrt.lus
diff --git a/test/site.exp b/test/site.exp
index bb089fc7..e8e0f903 100644
--- a/test/site.exp
+++ b/test/site.exp
@@ -1,4 +1,4 @@
-# Time-stamp: <modified the 03/07/2018 (at 14:49) by Erwan Jahier> 
+# Time-stamp: <modified the 03/03/2020 (at 15:24) by Erwan Jahier> 
 # 
 # (nonreg-)test harness main file
 
@@ -236,7 +236,7 @@ proc nonreg_exec_and_2c {files tmp} {
         set node [file tail $f_no_ext]
         set port [get_free_port]
 
-        eval spawn "$lus2lic -lic $opt -o $bf.lic $f"
+        eval spawn "$lus2lic -lic $opt -o $bf.lic $f -n $node"
         wait -i $spawn_id
         if { [nonemptyfile "$bf.lic"] &&  [does_not_contain_left_slices "$f"] } {
             set id1 [should_work "Generate c code  " "$lus2lic $opt" "-2c $f -n $node"]
@@ -281,10 +281,10 @@ proc nonreg_exec_and_ecexe {files tmp} {
         set opt [read_opt $f]
         set node [file tail $f_no_ext]
 
-        set id1 [should_work "without any option" "$lus2lic" "$opt" "-lic -o $bf.lic $f"]
+        set id1 [should_work "without any option" "$lus2lic" "$opt" "-lic -o $bf.lic $f -n $node"]
         wait -i $id1
         if { [nonemptyfile "$bf.lic"] } {
-            set id2 [should_work "Generate ec code  " "$lus2lic" "-ec -o $bf.ec $f"]
+            set id2 [should_work "Generate ec code  " "$lus2lic" "-ec -o $bf.ec $f -n $node"]
             wait -i $id2
         
             if { [nonemptyfile "$bf.ec"] && [does_not_contain_string "$f" "merge"] } {
-- 
GitLab