Commit 0eb6491c authored by erwan's avatar erwan
Browse files

Fix: the -ec options was setting the (experimental) -eeb mode. Use the more robust -ee instean.

(It would have avoided issue #8)
parent 6e28a5d6
Pipeline #28556 passed with stages
in 2 minutes and 11 seconds
(* Time-stamp: <modified the 29/08/2019 (at 16:44) by Erwan Jahier> *)
(* Time-stamp: <modified the 04/09/2019 (at 15:27) by Erwan Jahier> *)
(*
Le manager d'argument adapt de celui de lutin, plus joli
N.B. solution un peu batarde : les options sont stockes, comme avant, dans Global,
......@@ -247,7 +247,7 @@ let set_v4_options opt =
let set_ec_options opt =
(match global_opt.expand_enums with
| AsEnum -> global_opt.expand_enums <- AsBool; (* only override the default *)
| AsEnum -> global_opt.expand_enums <- AsConst; (* only override the default *)
| AsInt | AsConst | AsBool -> ());
set_v4_options opt;
global_opt.ec <- true;
......@@ -398,7 +398,7 @@ let mkoptab (opt:t) : unit = (
mkopt opt
["-ec"; "--expanded-code"]
(Arg.Unit (fun _ -> set_ec_options opt))
["Generate ec programs (force '--expand-nodes --no-when-not --expand-enums-as-bool --lustre-v4 --no-prefix')"]
["Generate ec programs (force '--expand-nodes --no-when-not --expand-enums --lustre-v4 --no-prefix')"]
;
mkopt opt ~doc_level:Advanced
["-np"; "--no-prefix"]
......
==> lus2lic0.sum <==
Test run by jahier on Wed Sep 4 15:05:25
Test run by jahier on Wed Sep 4 15:32:24
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 Wed Sep 4 15:05:26
Test run by jahier on Wed Sep 4 15:32:25
Native configuration is x86_64-pc-linux-gnu
=== lus2lic1 tests ===
......@@ -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 Wed Sep 4 15:05:55
Test run by jahier on Wed Sep 4 15:32:55
Native configuration is x86_64-pc-linux-gnu
=== lus2lic2 tests ===
......@@ -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 Wed Sep 4 15:06:25
Test run by jahier on Wed Sep 4 15:33:28
Native configuration is x86_64-pc-linux-gnu
=== lus2lic3 tests ===
......@@ -1259,7 +1259,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
==> lus2lic4.sum <==
Test run by jahier on Wed Sep 4 15:07:07
Test run by jahier on Wed Sep 4 15:34:10
Native configuration is x86_64-pc-linux-gnu
=== lus2lic4 tests ===
......@@ -1777,13 +1777,13 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
===============================
# Total number of failures: 69
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 29 seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 30 seconds
lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 30 seconds
lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 33 seconds
lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 42 seconds
lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 18 seconds
* Ref time:
63.26user 25.22system 1:59.59elapsed 73%CPU (0avgtext+0avgdata 283472maxresident)k
0inputs+139504outputs (0major+15354836minor)pagefaults 0swaps
66.61user 26.54system 2:04.31elapsed 74%CPU (0avgtext+0avgdata 283520maxresident)k
0inputs+139544outputs (0major+15342817minor)pagefaults 0swaps
* Quick time (-j 4):
70.81user 26.56system 1:11.65elapsed 135%CPU (0avgtext+0avgdata 283476maxresident)k
0inputs+138528outputs (0major+15273199minor)pagefaults 0swaps
68.22user 26.18system 1:10.91elapsed 133%CPU (0avgtext+0avgdata 283396maxresident)k
0inputs+139000outputs (0major+15295526minor)pagefaults 0swaps
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment