From d4498a181c7a7a9aea786e534bad890bd4e1c11d Mon Sep 17 00:00:00 2001 From: Erwan Jahier <jahier@imag.fr> Date: Mon, 24 Feb 2014 16:36:46 +0100 Subject: [PATCH] Apply the change of data structure done in the OcamlRM module (s/add_/reg_/g) cf git sha 142783a77cad1a0f7ef91972b8376f0b0e44b878 of rdbg --- src/genOcamlGlue.ml | 14 +++++++------- src/lv6version.ml | 6 +++--- test/lus2lic.sum | 10 +++++----- test/lus2lic.time | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/genOcamlGlue.ml b/src/genOcamlGlue.ml index c6b93be8..2f42fc67 100644 --- a/src/genOcamlGlue.ml +++ b/src/genOcamlGlue.ml @@ -1,4 +1,4 @@ -(* Time-stamp: <modified the 04/12/2013 (at 15:57) by Erwan Jahier> *) +(* Time-stamp: <modified the 21/02/2014 (at 18:08) by Erwan Jahier> *) (* generate ocaml glue code that makes it possible to call lus2lic from ocaml with the current set of arguments (with Lus2licRun.make). @@ -26,10 +26,10 @@ let inputs, outputs, kill, step, step_dbg, mems_i,mems_o = let dyn_file = (Dynlink.adapt_filename \"%s\") let _ = - OcamlRM.add_inputs dyn_file inputs; - OcamlRM.add_outputs dyn_file outputs; - OcamlRM.add_kill dyn_file kill; - OcamlRM.add_step dyn_file step; - OcamlRM.add_step_dbg dyn_file step_dbg; - OcamlRM.add_mems dyn_file mems_i mems_o + OcamlRM.reg_inputs dyn_file inputs; + OcamlRM.reg_outputs dyn_file outputs; + OcamlRM.reg_kill dyn_file kill; + OcamlRM.reg_step dyn_file step; + OcamlRM.reg_step_dbg dyn_file step_dbg; + OcamlRM.reg_mems dyn_file mems_i mems_o " args_str cma_file diff --git a/src/lv6version.ml b/src/lv6version.ml index 94187169..78ae5605 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 = "409" -let sha_1 = "06ddb863bcbd023f74876adc12e50778a2afe9d7" +let branch = "(no" +let commit = "435" +let sha_1 = "87f4094c27892b43310e95b26177616923abaccf" let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")") let maintainer = "jahier@imag.fr" diff --git a/test/lus2lic.sum b/test/lus2lic.sum index 2e8d506a..449b2170 100644 --- a/test/lus2lic.sum +++ b/test/lus2lic.sum @@ -1,4 +1,4 @@ -Test Run By jahier on Thu Feb 20 11:26:43 2014 +Test Run By jahier on Mon Feb 24 16:32:03 2014 Native configuration is i686-pc-linux-gnu === lus2lic tests === @@ -1028,7 +1028,7 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman # of unexpected failures 76 # of unexpected successes 21 # of expected failures 37 -testcase ./lus2lic.tests/non-reg.exp completed in 103 seconds -testcase ./lus2lic.tests/progression.exp completed in 1 seconds -testcase ./lus2lic.tests/non-reg.exp completed in 103 seconds -testcase ./lus2lic.tests/progression.exp completed in 1 seconds +testcase ./lus2lic.tests/non-reg.exp completed in 102 seconds +testcase ./lus2lic.tests/progression.exp completed in 0 seconds +testcase ./lus2lic.tests/non-reg.exp completed in 102 seconds +testcase ./lus2lic.tests/progression.exp completed in 0 seconds diff --git a/test/lus2lic.time b/test/lus2lic.time index 424e7211..b52cbf68 100644 --- a/test/lus2lic.time +++ b/test/lus2lic.time @@ -1,2 +1,2 @@ -testcase ./lus2lic.tests/non-reg.exp completed in 103 seconds -testcase ./lus2lic.tests/progression.exp completed in 1 seconds +testcase ./lus2lic.tests/non-reg.exp completed in 102 seconds +testcase ./lus2lic.tests/progression.exp completed in 0 seconds -- GitLab