diff --git a/.gitignore b/.gitignore
index 4afe282ffeeb9e5691dbc9ac8f5093ff8a79a094..851359aabb93c7e63502da1b740da02e53368e6a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,10 +125,10 @@ utils/test_lustrequiv/
w7/
willy.org
lutils/
-
+.merlin
LustreCoq.jpg
*.seed
-
+rdbg-session*.ml
arduino/led_puzlle/arduino1
arduino/led_puzlle/arduino2
arduino/led_puzlle/arduino3
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c57dcac326d19bb90bf60580ef8293610643dbb..c11dbf899ec0e9856778aedc819a850182043422 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ build:
test_opam_test:
stage: test
script:
+ - sudo apt-get install -y m4
- opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/test/opam-repository"
- opam update
- opam install -y lustre-v6
diff --git a/lustre-v6.opam b/lustre-v6.opam
index 0fc9c4cc428e894f8626d4f896a417d1f269e153..edd2f1ff646e3fdf9fb211fe0c76ba51d0f7528b 100644
--- a/lustre-v6.opam
+++ b/lustre-v6.opam
@@ -15,9 +15,9 @@ depends: [
"ocaml" {>= "4.05"}
"base-unix"
"extlib" {build} | "extlib-compat" {build}
- "lutils" {>= "1.49"}
"dune"
"ocamlfind"
+ "lutils" {>= "1.49"}
"rdbg" {> "1.184"}
]
build: [
diff --git a/lv6-ref-man/lv6-ref-man.pdf b/lv6-ref-man/lv6-ref-man.pdf
index 6be6eb74e7760a5e9f58a5cc57c9eec70debaacb..88f1fed7153747a582f29d2ce41d1ad114d83345 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 8fa4717481f5b7c8cae2a5dc027cbaac58ad60d8..a121bfd94e1df329899258cabe8355f137c34bb0 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test run by jahier on Thu Aug 29 17:16:59
+Test run by jahier on Mon Sep 2 09:20:18
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 Thu Aug 29 17:17:00
+Test run by jahier on Mon Sep 2 09:20:19
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 Thu Aug 29 17:17:28
+Test run by jahier on Mon Sep 2 09:20:43
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 Thu Aug 29 17:18:01
+Test run by jahier on Mon Sep 2 09:21:12
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 Thu Aug 29 17:18:46
+Test run by jahier on Mon Sep 2 09:21:54
Native configuration is x86_64-pc-linux-gnu
=== lus2lic4 tests ===
@@ -1776,14 +1776,14 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
# of unexpected failures 18
===============================
# 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 28 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 33 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 45 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 20 seconds
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 24 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 29 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 42 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 17 seconds
* Ref time:
-67.59user 27.34system 2:06.95elapsed 74%CPU (0avgtext+0avgdata 273116maxresident)k
-8inputs+139680outputs (0major+15329517minor)pagefaults 0swaps
+59.94user 23.36system 1:53.07elapsed 73%CPU (0avgtext+0avgdata 283492maxresident)k
+0inputs+139360outputs (0major+15352444minor)pagefaults 0swaps
* Quick time (-j 4):
-74.50user 27.98system 1:13.34elapsed 139%CPU (0avgtext+0avgdata 272676maxresident)k
-0inputs+138992outputs (0major+15280273minor)pagefaults 0swaps
+68.51user 26.31system 1:09.99elapsed 135%CPU (0avgtext+0avgdata 283412maxresident)k
+0inputs+136864outputs (0major+15153120minor)pagefaults 0swaps