From 09e2df2de3cf42d9f641c6d05eaff354ccb18083 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Wed, 26 Oct 2022 15:59:35 +0200
Subject: [PATCH] fix: a bug in enumerated clocks in -exec mode (due to
de676726e9fc)
---
lib/socExecValue.ml | 3 ++-
test/lus2lic.sum | 24 ++++++++++++------------
2 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/lib/socExecValue.ml b/lib/socExecValue.ml
index 8a289c25..fa1f1ef8 100644
--- a/lib/socExecValue.ml
+++ b/lib/socExecValue.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 15/03/2021 (at 15:44) by Erwan Jahier> *)
+(* Time-stamp: <modified the 26/10/2022 (at 15:58) by Erwan Jahier> *)
let dbg = (Lv6Verbose.get_flag "exec")
@@ -260,6 +260,7 @@ fun id ctx ->
| U ->
(* print_string (id ^ " undefined\n"); flush stdout; *)
raise Not_found
+ | I i -> string_of_int i
| o ->
print_string ("get_enum '" ^ (val_to_string string_of_float o) ^"' failed\n"); flush stdout;
assert false (* should not fail *)
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index dbe2940e..055647ef 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,5 +1,5 @@
==> lus2lic0.sum <==
-Test run by jahier on Mon Oct 24 17:49:20
+Test run by jahier on Wed Oct 26 16:01:44
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 Oct 24 17:49:20
+Test run by jahier on Wed Oct 26 16:01:45
Native configuration is x86_64-pc-linux-gnu
=== lus2lic1 tests ===
@@ -631,7 +631,7 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_exec_and_2c multipar.lus {}
PASS: /home/jahier/lus2lic/test/../utils/compare_lv6_and_lv6_en multipar.lus {}
==> lus2lic2.sum <==
-Test run by jahier on Mon Oct 24 17:52:34
+Test run by jahier on Wed Oct 26 16:08:38
Native configuration is x86_64-pc-linux-gnu
=== lus2lic2 tests ===
@@ -1177,7 +1177,7 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_lv6_and_lv6_en zzz2.lus {}
PASS: /home/jahier/lus2lic/test/../utils/compare_gcc_and_clang zzz2.lus {}
==> lus2lic3.sum <==
-Test run by jahier on Mon Oct 24 17:56:17
+Test run by jahier on Wed Oct 26 16:15:42
Native configuration is x86_64-pc-linux-gnu
=== lus2lic3 tests ===
@@ -1696,7 +1696,7 @@ PASS: /home/jahier/lus2lic/test/../utils/test_lus2lic_no_node multipar.lus {}
==> lus2lic4.sum <==
-Test run by jahier on Mon Oct 24 17:57:11
+Test run by jahier on Wed Oct 26 16:17:04
Native configuration is x86_64-pc-linux-gnu
=== lus2lic4 tests ===
@@ -2223,12 +2223,12 @@ PASS: /home/jahier/lus2lic/test/../utils/compare_gcc_and_clang multipar.lus {}
# of unexpected failures 6
===============================
# Total number of failures: 18
-lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 0 seconds
-lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 194 seconds
-lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 223 seconds
-lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 54 seconds
-lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 34 seconds
+lus2lic0.log:testcase ./lus2lic.tests/test0.exp completed in 1 seconds
+lus2lic1.log:testcase ./lus2lic.tests/test1.exp completed in 413 seconds
+lus2lic2.log:testcase ./lus2lic.tests/test2.exp completed in 424 seconds
+lus2lic3.log:testcase ./lus2lic.tests/test3.exp completed in 82 seconds
+lus2lic4.log:testcase ./lus2lic.tests/test4.exp completed in 66 seconds
* Ref time:
-185.72user 57.59system 8:25.01elapsed 48%CPU (0avgtext+0avgdata 99220maxresident)k
-0inputs+485896outputs (11major+21307267minor)pagefaults 0swaps
+344.23user 106.51system 16:26.50elapsed 45%CPU (0avgtext+0avgdata 99220maxresident)k
+7128inputs+486056outputs (93major+21309952minor)pagefaults 0swaps
* Quick time (-j 4):
--
GitLab