diff --git a/_oasis b/_oasis index cfe794432116ea69db55d3f908caa95e9ec60edd..7763aac61896ef44e0950b91425f6eb0a5dcb88c 100644 --- a/_oasis +++ b/_oasis @@ -1,6 +1,6 @@ OASISFormat: 0.4 Name: lustre-v6 -Version: 1.635 +Version: 1.637 Synopsis: The Lustre V6 Verimag compiler Description: This package contains: - lus2lic: the (current) name of the compiler (and interpreter via -exec). diff --git a/src/lv6version.ml b/src/lv6version.ml index ef490d66016fe2fd6eefe265626b4a0d4b8c2768..9c0a2f6bb470be87077ca6e1ef663423a94b2f58 100644 --- a/src/lv6version.ml +++ b/src/lv6version.ml @@ -1,7 +1,7 @@ (** Automatically generated from Makefile *) let tool = "lus2lic" let branch = "master" -let commit = "635" -let sha_1 = "b7b6d71173e89f22215ec2eba3e25e3133a68cdb" +let commit = "637" +let sha_1 = "61c67b31feab950b2739229bb755904b4f1f4cb5" let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")") let maintainer = "jahier@imag.fr" diff --git a/test/lus2lic.sum b/test/lus2lic.sum index aefb7d9c2267cd2078a92a22ae5b22e7f5accd91..2e7c5e04c678f76591643e440efac8bb0ddd24fe 100644 --- a/test/lus2lic.sum +++ b/test/lus2lic.sum @@ -1,5 +1,5 @@ ==> lus2lic0.sum <== -Test Run By jahier on Mon Feb 1 17:17:36 +Test Run By jahier on Tue Feb 2 10:19:20 Native configuration is x86_64-unknown-linux-gnu === lus2lic0 tests === @@ -64,7 +64,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 Feb 1 17:17:37 +Test Run By jahier on Tue Feb 2 10:19:20 Native configuration is x86_64-unknown-linux-gnu === lus2lic1 tests === @@ -396,7 +396,7 @@ PASS: gcc -o multipar.exec multipar_multipar.c multipar_multipar_loop.c PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {} ==> lus2lic2.sum <== -Test Run By jahier on Mon Feb 1 17:17:52 +Test Run By jahier on Tue Feb 2 10:19:37 Native configuration is x86_64-unknown-linux-gnu === lus2lic2 tests === @@ -411,7 +411,7 @@ PASS: gcc -o PCOND.exec PCOND_PCOND.c PCOND_PCOND_loop.c PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND.lus {} PASS: ./lus2lic {-2c PCOND1.lus -n PCOND1} PASS: gcc -o PCOND1.exec PCOND1_PCOND1.c PCOND1_PCOND1_loop.c -FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND1.lus {} +PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c PCOND1.lus {} PASS: ./lus2lic {-2c SOURIS.lus -n SOURIS} PASS: gcc -o SOURIS.exec SOURIS_SOURIS.c SOURIS_SOURIS_loop.c PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c SOURIS.lus {} @@ -506,7 +506,7 @@ PASS: gcc -o onlyroll.exec onlyroll_onlyroll.c onlyroll_onlyroll_loop.c PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c onlyroll.lus {} PASS: ./lus2lic {-2c onlyroll2.lus -n onlyroll2} PASS: gcc -o onlyroll2.exec onlyroll2_onlyroll2.c onlyroll2_onlyroll2_loop.c -FAIL: Try to compare lus2lic -exec and -2c: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c onlyroll2.lus {} +PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c onlyroll2.lus {} PASS: ./lus2lic {-2c over2.lus -n over2} PASS: gcc -o over2.exec over2_over2.c over2_over2_loop.c PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c over2.lus {} @@ -741,7 +741,7 @@ PASS: gcc -o zzz2.exec zzz2_zzz2.c zzz2_zzz2_loop.c PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c zzz2.lus {} ==> lus2lic3.sum <== -Test Run By jahier on Mon Feb 1 17:18:38 +Test Run By jahier on Tue Feb 2 10:20:23 Native configuration is x86_64-unknown-linux-gnu === lus2lic3 tests === @@ -1243,7 +1243,7 @@ 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 Mon Feb 1 17:18:52 +Test Run By jahier on Tue Feb 2 10:20:38 Native configuration is x86_64-unknown-linux-gnu === lus2lic4 tests === @@ -1260,7 +1260,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node PCOND.lus {} PASS: ./lus2lic {-o PCOND1.lic PCOND1.lus} PASS: ./lus2lic {-ec -o PCOND1.ec PCOND1.lus} PASS: ./myec2c {-o PCOND1.c PCOND1.ec} -FAIL: Try to compare lus2lic -exec and ecexe: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node PCOND1.lus {} +PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node PCOND1.lus {} PASS: ./lus2lic {-o SOURIS.lic SOURIS.lus} PASS: ./lus2lic {-ec -o SOURIS.ec SOURIS.lus} PASS: ./myec2c {-o SOURIS.c SOURIS.ec} @@ -1746,8 +1746,8 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {} === lus2lic2 Summary === -# of expected passes 328 -# of unexpected failures 5 +# of expected passes 330 +# of unexpected failures 3 ==> lus2lic3.sum <== @@ -1760,18 +1760,18 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {} === lus2lic4 Summary === -# of expected passes 470 -# of unexpected failures 5 +# of expected passes 471 +# of unexpected failures 4 =============================== -# Total number of failures: 26 +# Total number of failures: 23 lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds -lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 15 seconds +lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 17 seconds lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 46 seconds lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 14 seconds -lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 50 seconds +lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 48 seconds * Ref time: -0.04user 0.03system 2:06.51elapsed 0%CPU (0avgtext+0avgdata 5164maxresident)k -32inputs+0outputs (0major+5628minor)pagefaults 0swaps +0.05user 0.02system 2:06.16elapsed 0%CPU (0avgtext+0avgdata 5208maxresident)k +64inputs+0outputs (0major+5599minor)pagefaults 0swaps * Quick time (-j 4): -0.02user 0.03system 0:56.40elapsed 0%CPU (0avgtext+0avgdata 5172maxresident)k -32inputs+0outputs (0major+5632minor)pagefaults 0swaps +0.03user 0.02system 0:57.00elapsed 0%CPU (0avgtext+0avgdata 5212maxresident)k +64inputs+0outputs (0major+5640minor)pagefaults 0swaps