From b80ad1fe8e6f5be3afb88f00e393ff8b2faa38f8 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Fri, 12 Dec 2014 11:15:17 +0100
Subject: [PATCH] The ocaml lib is now named "lustre-v6" instead of
"lus2ocaml".
---
_oasis | 2 +-
_tags | 6 +++---
test/lus2lic.sum | 24 +++++++++++-------------
test/lus2lic.time | 14 ++++++--------
4 files changed, 21 insertions(+), 25 deletions(-)
diff --git a/_oasis b/_oasis
index 5e986f88..5a257779 100644
--- a/_oasis
+++ b/_oasis
@@ -29,7 +29,7 @@ Executable lus2lic
# dir ~/lus2lic/src ~/lus2lic/ ~/lus2lic/_build/src /usr/local/soft/ocaml/4.01.0/lib/ocaml/rdbg-plugin/
-Library lus4ocaml
+Library "lustre-v6"
Modules: Lus2licRun
Path: src/
BuildTools: ocamlbuild
diff --git a/_tags b/_tags
index 87595951..dea1d7ce 100644
--- a/_tags
+++ b/_tags
@@ -1,5 +1,5 @@
# OASIS_START
-# DO NOT EDIT (digest: 27f968445ada0c5de5d09ce2bf0e3fd2)
+# DO NOT EDIT (digest: 6cd34ce331e0b71fa46de84e0a14647e)
# Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process
@@ -18,8 +18,8 @@
"src/main.native": pkg_unix
"src/main.native": pkg_num
"src/main.native": pkg_rdbg-plugin
-# Library lus4ocaml
-"src/lus4ocaml.cmxs": use_lus4ocaml
+# Library lustre-v6
+"src/lustre-v6.cmxs": use_lustre-v6
<src/*.ml{,i}>: pkg_str
<src/*.ml{,i}>: pkg_unix
<src/*.ml{,i}>: pkg_num
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 84088c44..3cefd2fb 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test Run By jahier on Mon Dec 8 16:31:37
+Test Run By jahier on Fri Dec 12 11:09:57
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic0 tests ===
@@ -63,7 +63,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 8 16:31:43
+Test Run By jahier on Fri Dec 12 11:10:01
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic1 tests ===
@@ -397,7 +397,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 Dec 8 16:31:39
+Test Run By jahier on Fri Dec 12 11:10:47
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic2 tests ===
@@ -727,7 +727,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 Dec 8 16:31:41
+Test Run By jahier on Fri Dec 12 11:12:21
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic3 tests ===
@@ -1230,7 +1230,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 Dec 8 16:31:45
+Test Run By jahier on Fri Dec 12 11:13:08
Native configuration is x86_64-unknown-linux-gnu
=== lus2lic4 tests ===
@@ -1727,13 +1727,11 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node zzz2.lus {}
===============================
# Total number of failures: 14
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 4 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 69 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 98 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 60 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 95 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 46 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 92 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 46 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 85 seconds
* Ref time:
-0.04user 0.05system 4:36.62elapsed 0%CPU (0avgtext+0avgdata 3012maxresident)k
-0inputs+0outputs (0major+14885minor)pagefaults 0swaps
+0.04user 0.04system 4:38.28elapsed 0%CPU (0avgtext+0avgdata 3012maxresident)k
+0inputs+0outputs (0major+14893minor)pagefaults 0swaps
* Quick time (-j 4):
-0.05user 0.03system 1:43.13elapsed 0%CPU (0avgtext+0avgdata 3012maxresident)k
-0inputs+0outputs (0major+14894minor)pagefaults 0swaps
diff --git a/test/lus2lic.time b/test/lus2lic.time
index 5081d9b6..597bbc11 100644
--- a/test/lus2lic.time
+++ b/test/lus2lic.time
@@ -1,11 +1,9 @@
lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 4 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 69 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 98 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 60 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 95 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 46 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 92 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 46 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 85 seconds
* Ref time:
-0.04user 0.05system 4:36.62elapsed 0%CPU (0avgtext+0avgdata 3012maxresident)k
-0inputs+0outputs (0major+14885minor)pagefaults 0swaps
+0.04user 0.04system 4:38.28elapsed 0%CPU (0avgtext+0avgdata 3012maxresident)k
+0inputs+0outputs (0major+14893minor)pagefaults 0swaps
* Quick time (-j 4):
-0.05user 0.03system 1:43.13elapsed 0%CPU (0avgtext+0avgdata 3012maxresident)k
-0inputs+0outputs (0major+14894minor)pagefaults 0swaps
--
GitLab