diff --git a/lib/socExecDbg.ml b/lib/socExecDbg.ml index 6d19625021ce092b353470b7c0068745c5241b47..96c9c23122c9756f23aa524e1049b8d3834d703c 100644 --- a/lib/socExecDbg.ml +++ b/lib/socExecDbg.ml @@ -1,4 +1,4 @@ -(* Time-stamp: <modified the 29/08/2019 (at 16:41) by Erwan Jahier> *) +(* Time-stamp: <modified the 10/12/2019 (at 10:20) by Erwan Jahier> *) open Soc open Data open SocExecValue @@ -588,9 +588,9 @@ and (do_soc_step : Lxm.t -> int option -> step_method -> SocExecValue.ctx -> Event.kind = Event.Exit; Event.lang = "lustre"; Event.name = step_name; - Event.inputs = nectx.Event.inputs; - Event.outputs = nectx.Event.outputs; - Event.locals = nectx.Event.locals; + Event.inputs = fst soc.profile; + Event.outputs = snd soc.profile; + Event.locals = locals; Event.sinfo = sinfo; Event.data = datal; Event.next = (fun () -> cont3 nectx val_ctx); diff --git a/lv6-ref-man/lv6-ref-man.pdf b/lv6-ref-man/lv6-ref-man.pdf index ecb257d593f10ac617b2de8a302c39a686d283dc..95fcfcbe8570ecbea97a175eb80891b56fafa2c5 100644 Binary files a/lv6-ref-man/lv6-ref-man.pdf and b/lv6-ref-man/lv6-ref-man.pdf differ diff --git a/test/lus2lic.sum b/test/lus2lic.sum index c8aa111b13752cc0ab99ce19db3ad1bd1bae94fa..92ac52313c95e23505971a9f5de1d8ab593269f8 100644 --- a/test/lus2lic.sum +++ b/test/lus2lic.sum @@ -1,5 +1,5 @@ ==> lus2lic0.sum <== -Test run by jahier on Mon Dec 2 14:30:17 +Test run by jahier on Tue Dec 10 10:25:29 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 Mon Dec 2 14:30:18 +Test run by jahier on Tue Dec 10 10:25:29 Native configuration is x86_64-pc-linux-gnu === lus2lic1 tests === @@ -94,13 +94,13 @@ PASS: sh FALLING_EDGE.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c FALLING_EDGE.lus {} PASS: ./lus2lic {-2c FillFollowedByRed.lus -n FillFollowedByRed} PASS: sh FillFollowedByRed.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c FillFollowedByRed.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c FillFollowedByRed.lus {} PASS: ./lus2lic {-2c Gyroscope.lus -n Gyroscope} PASS: sh Gyroscope.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c Gyroscope.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c Gyroscope.lus {} PASS: ./lus2lic {-2c Gyroscope2.lus -n Gyroscope2} PASS: sh Gyroscope2.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c Gyroscope2.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c Gyroscope2.lus {} PASS: ./lus2lic {-2c aa.lus -n aa} PASS: sh aa.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c aa.lus {} @@ -121,7 +121,7 @@ PASS: sh after.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c after.lus {} PASS: ./lus2lic {-2c alias.lus -n alias} PASS: sh alias.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c alias.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c alias.lus {} PASS: ./lus2lic {-2c amaury.lus -n amaury} PASS: sh amaury.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c amaury.lus {} @@ -140,7 +140,7 @@ PASS: sh array_equals.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c array_equals.lus {} PASS: ./lus2lic {-2c arrays.lus -n arrays} PASS: sh arrays.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c arrays.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c arrays.lus {} PASS: ./lus2lic --expand-nodes {-2c asservi.lus -n asservi} PASS: ./lus2lic {-2c bad_call03.lus -n bad_call03} PASS: sh bad_call03.sh @@ -165,7 +165,7 @@ PASS: sh bug2.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c bug2.lus {} PASS: ./lus2lic {-2c calculs_max.lus -n calculs_max} PASS: sh calculs_max.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c calculs_max.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c calculs_max.lus {} PASS: ./lus2lic {-2c call.lus -n call} PASS: ./lus2lic {-2c call01.lus -n call01} PASS: ./lus2lic {-2c call02.lus -n call02} @@ -238,7 +238,7 @@ PASS: sh cst.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c cst.lus {} PASS: ./lus2lic {-2c deSimone.lus -n deSimone} PASS: sh deSimone.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c deSimone.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c deSimone.lus {} PASS: ./lus2lic {-2c decl.lus -n decl} PASS: ./lus2lic {-2c declaration.lus -n declaration} PASS: ./lus2lic {-2c deconne.lus -n deconne} @@ -271,7 +271,7 @@ PASS: sh exclusion.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c exclusion.lus {} PASS: ./lus2lic {-2c filliter.lus -n filliter} PASS: sh filliter.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c filliter.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c filliter.lus {} PASS: ./lus2lic {-2c filter.lus -n filter} PASS: sh filter.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c filter.lus {} @@ -303,16 +303,16 @@ PASS: sh integrator.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c integrator.lus {} PASS: ./lus2lic {-2c is_stable.lus -n is_stable} PASS: sh is_stable.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c is_stable.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c is_stable.lus {} PASS: ./lus2lic {-2c iter.lus -n iter} PASS: sh iter.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c iter.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c iter.lus {} PASS: ./lus2lic {-2c iterFibo.lus -n iterFibo} PASS: sh iterFibo.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c iterFibo.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c iterFibo.lus {} PASS: ./lus2lic {-2c iterate.lus -n iterate} PASS: sh iterate.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c iterate.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c iterate.lus {} PASS: ./lus2lic {-2c long_et_stupide_nom_de_noeud.lus -n long_et_stupide_nom_de_noeud} PASS: sh long_et_stupide_nom_de_noeud.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c long_et_stupide_nom_de_noeud.lus {} @@ -327,7 +327,7 @@ PASS: sh map_red_iter.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c map_red_iter.lus {} PASS: ./lus2lic {-2c mapdeRed.lus -n mapdeRed} PASS: sh mapdeRed.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c mapdeRed.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c mapdeRed.lus {} PASS: ./lus2lic {-2c mapinf.lus -n mapinf} PASS: sh mapinf.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c mapinf.lus {} @@ -339,10 +339,10 @@ PASS: sh mappredef.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c mappredef.lus {} PASS: ./lus2lic {-2c matrice.lus -n matrice} PASS: sh matrice.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c matrice.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c matrice.lus {} PASS: ./lus2lic {-2c matrice2.lus -n matrice2} PASS: sh matrice2.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c matrice2.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c matrice2.lus {} PASS: ./lus2lic {-2c minmax1.lus -n minmax1} PASS: sh minmax1.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c minmax1.lus {} @@ -365,7 +365,7 @@ PASS: sh minmax6.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c minmax6.lus {} PASS: ./lus2lic {-2c minus.lus -n minus} PASS: sh minus.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c minus.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c minus.lus {} PASS: ./lus2lic {-2c mm.lus -n mm} PASS: sh mm.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c mm.lus {} @@ -400,7 +400,7 @@ PASS: sh mouse3.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c mouse3.lus {} PASS: ./lus2lic {-2c moyenne.lus -n moyenne} PASS: sh moyenne.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c moyenne.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c moyenne.lus {} PASS: ./lus2lic {-2c multiclock.lus -n multiclock} PASS: sh multiclock.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multiclock.lus {} @@ -409,7 +409,7 @@ PASS: sh multipar.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {} ==> lus2lic2.sum <== -Test run by jahier on Mon Dec 2 14:30:43 +Test run by jahier on Tue Dec 10 10:25:55 Native configuration is x86_64-pc-linux-gnu === lus2lic2 tests === @@ -546,7 +546,7 @@ 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 {-2c pipeline.lus -n pipeline} PASS: sh pipeline.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c pipeline.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c pipeline.lus {} PASS: ./lus2lic {-2c plus.lus -n plus} PASS: sh plus.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c plus.lus {} @@ -574,13 +574,13 @@ PASS: sh predef01.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c predef01.lus {} PASS: ./lus2lic {-2c predef02.lus -n predef02} PASS: sh predef02.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c predef02.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c predef02.lus {} PASS: ./lus2lic {-2c predef03.lus -n predef03} PASS: sh predef03.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c predef03.lus {} PASS: ./lus2lic {-2c predefOp.lus -n predefOp} PASS: sh predefOp.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c predefOp.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c predefOp.lus {} PASS: ./lus2lic {-2c produitBool.lus -n produitBool} PASS: sh produitBool.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c produitBool.lus {} @@ -589,13 +589,13 @@ PASS: sh real_ex.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c real_ex.lus {} PASS: ./lus2lic {-2c redIf.lus -n redIf} PASS: sh redIf.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c redIf.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c redIf.lus {} PASS: ./lus2lic {-2c rediter.lus -n rediter} PASS: sh rediter.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c rediter.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c rediter.lus {} PASS: ./lus2lic {-2c redoptest.lus -n redoptest} PASS: sh redoptest.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c redoptest.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c redoptest.lus {} PASS: ./lus2lic {-2c remplissage.lus -n remplissage} PASS: ./lus2lic {-2c rs.lus -n rs} PASS: sh rs.sh @@ -615,7 +615,7 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c shift_ludic.lus {} PASS: ./lus2lic {-2c simple.lus -n simple} PASS: ./lus2lic {-2c simpleRed.lus -n simpleRed} PASS: sh simpleRed.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c simpleRed.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c simpleRed.lus {} PASS: ./lus2lic {-2c sincos.lus -n sincos} PASS: sh sincos.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c sincos.lus {} @@ -703,10 +703,10 @@ PASS: sh toto.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c toto.lus {} PASS: ./lus2lic {-2c tri.lus -n tri} PASS: sh tri.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c tri.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c tri.lus {} PASS: ./lus2lic {-2c triSel.lus -n triSel} PASS: sh triSel.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c triSel.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c triSel.lus {} PASS: ./lus2lic {-2c trivial.lus -n trivial} PASS: sh trivial.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c trivial.lus {} @@ -737,10 +737,10 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c v1.lus {} PASS: ./lus2lic {-2c when_tuple.lus -n when_tuple} PASS: ./lus2lic {-2c xx.lus -n xx} PASS: sh xx.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c xx.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c xx.lus {} PASS: ./lus2lic {-2c yyy.lus -n yyy} PASS: sh yyy.sh -PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c yyy.lus {} +FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c yyy.lus {} PASS: ./lus2lic {-2c zzz.lus -n zzz} PASS: sh zzz.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz.lus {} @@ -749,7 +749,7 @@ PASS: sh zzz2.sh PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus {} ==> lus2lic3.sum <== -Test run by jahier on Mon Dec 2 14:31:14 +Test run by jahier on Tue Dec 10 10:26:26 Native configuration is x86_64-pc-linux-gnu === lus2lic3 tests === @@ -784,11 +784,11 @@ 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: ./myec2c {-o FillFollowedByRed.c FillFollowedByRed.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node FillFollowedByRed.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o Gyroscope.c Gyroscope.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node Gyroscope.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o Gyroscope2.c Gyroscope2.ec} @@ -820,7 +820,7 @@ 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: ./myec2c {-o alias.c alias.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node alias.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o amaury.c amaury.ec} @@ -847,7 +847,7 @@ 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: ./myec2c {-o arrays.c arrays.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node arrays.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o asservi.c asservi.ec} @@ -883,7 +883,7 @@ 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} PASS: ./myec2c {-o calculs_max.c calculs_max.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node calculs_max.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o call.c call.ec} @@ -996,7 +996,7 @@ 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: ./myec2c {-o deSimone.c deSimone.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node deSimone.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o decl.c decl.ec} @@ -1044,7 +1044,7 @@ 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: ./myec2c {-o filliter.c filliter.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node filliter.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o filter.c filter.ec} @@ -1090,7 +1090,7 @@ 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: ./myec2c {-o is_stable.c is_stable.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node is_stable.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o iter.c iter.ec} @@ -1098,11 +1098,11 @@ FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils PASS: ./lus2lic {} {-lic -o iterFibo.lic iterFibo.lus} PASS: ./lus2lic {-ec -o iterFibo.ec iterFibo.lus} PASS: ./myec2c {-o iterFibo.c iterFibo.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node iterFibo.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o iterate.c iterate.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node iterate.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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} @@ -1126,7 +1126,7 @@ 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: ./myec2c {-o mapdeRed.c mapdeRed.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node mapdeRed.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o mapinf.c mapinf.ec} @@ -1142,11 +1142,11 @@ 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: ./myec2c {-o matrice.c matrice.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node matrice.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o matrice2.c matrice2.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node matrice2.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node matrice2.lus {} PASS: ./lus2lic {} {-lic -o minmax1.lic minmax1.lus} PASS: ./lus2lic {-ec -o minmax1.ec minmax1.lus} PASS: ./myec2c {-o minmax1.c minmax1.ec} @@ -1180,7 +1180,7 @@ 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: ./myec2c {-o minus.c minus.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node minus.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o mm.c mm.ec} @@ -1247,7 +1247,7 @@ 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: ./myec2c {-o moyenne.c moyenne.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node moyenne.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o multiclock.c multiclock.ec} @@ -1259,7 +1259,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {} ==> lus2lic4.sum <== -Test run by jahier on Mon Dec 2 14:31:54 +Test run by jahier on Tue Dec 10 10:27:06 Native configuration is x86_64-pc-linux-gnu === lus2lic4 tests === @@ -1451,7 +1451,7 @@ PASS: ./myec2c {-o pilote.c pilote.ec} PASS: ./lus2lic {} {-lic -o pipeline.lic pipeline.lus} PASS: ./lus2lic {-ec -o pipeline.ec pipeline.lus} PASS: ./myec2c {-o pipeline.c pipeline.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node pipeline.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o plus.c plus.ec} @@ -1490,7 +1490,7 @@ 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: ./myec2c {-o predef02.c predef02.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node predef02.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o predef03.c predef03.ec} @@ -1498,7 +1498,7 @@ 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: ./myec2c {-o predefOp.c predefOp.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node predefOp.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o produitBool.c produitBool.ec} @@ -1510,15 +1510,15 @@ 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: ./myec2c {-o redIf.c redIf.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node redIf.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o rediter.c rediter.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node rediter.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o redoptest.c redoptest.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node redoptest.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o remplissage.c remplissage.ec} @@ -1548,7 +1548,7 @@ PASS: ./myec2c {-o simple.c simple.ec} PASS: ./lus2lic {} {-lic -o simpleRed.lic simpleRed.lus} PASS: ./lus2lic {-ec -o simpleRed.ec simpleRed.lus} PASS: ./myec2c {-o simpleRed.c simpleRed.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node simpleRed.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o sincos.c sincos.ec} @@ -1681,11 +1681,11 @@ 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: ./myec2c {-o tri.c tri.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node tri.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o triSel.c triSel.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node triSel.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o trivial.c trivial.ec} @@ -1727,11 +1727,11 @@ 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: ./myec2c {-o xx.c xx.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node xx.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o yyy.c yyy.ec} -PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node yyy.lus {} +FAIL: Try to compare lus2lic -exec and ecexe: /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: ./myec2c {-o zzz.c zzz.ec} @@ -1751,39 +1751,39 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {} === lus2lic1 Summary === -# of expected passes 330 -# of unexpected failures 1 +# of expected passes 313 +# of unexpected failures 18 ==> lus2lic2.sum <== === lus2lic2 Summary === -# of expected passes 326 -# of unexpected failures 2 +# of expected passes 315 +# of unexpected failures 13 ==> lus2lic3.sum <== === lus2lic3 Summary === -# of expected passes 491 -# of unexpected failures 5 +# of expected passes 476 +# of unexpected failures 20 # of unresolved testcases 1 ==> lus2lic4.sum <== === lus2lic4 Summary === -# of expected passes 464 -# of unexpected failures 7 +# of expected passes 453 +# of unexpected failures 18 =============================== -# Total number of failures: 15 -lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds -lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 25 seconds +# Total number of failures: 69 +lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds +lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 26 seconds lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 31 seconds lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 40 seconds lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 16 seconds * Ref time: -60.83user 20.19system 1:53.37elapsed 71%CPU (0avgtext+0avgdata 284112maxresident)k -0inputs+143424outputs (0major+11159217minor)pagefaults 0swaps +62.32user 20.37system 1:53.50elapsed 72%CPU (0avgtext+0avgdata 283308maxresident)k +0inputs+139656outputs (0major+11771660minor)pagefaults 0swaps * Quick time (-j 4): -69.13user 22.06system 1:14.18elapsed 122%CPU (0avgtext+0avgdata 284132maxresident)k -10592inputs+141952outputs (5major+11074425minor)pagefaults 0swaps +72.81user 24.00system 1:14.69elapsed 129%CPU (0avgtext+0avgdata 283532maxresident)k +21680inputs+138472outputs (24major+11689754minor)pagefaults 0swaps