From 6e34dd5883b09d4fb4c8b8c3c4bb0ba2bd818de4 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <jahier@imag.fr>
Date: Fri, 6 Dec 2013 17:56:27 +0100
Subject: [PATCH] Fix a bug in the -rif mode where the inputs were repeated.
That was quite confusing for rdbg -lurette --*-stdio !!!
---
Makefile | 2 +-
src/lv6version.ml | 4 ++--
src/socExec.ml | 12 +++++++-----
test/Makefile | 2 --
test/lus2lic.log.ref | 30 ++++++++++++++++++++----------
test/lus2lic.sum | 4 +++-
test/lus2lic.tests/progression.exp | 2 +-
test/site.exp | 3 +++
utils/test_lus2lic_no_node | 3 +++
9 files changed, 40 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile
index 27d60152..71b305e8 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ setup.data:configure
configure: setup.ml
ocaml setup.ml -configure --prefix $(LUSTREV6_PATH) --exec-prefix $(LUSTREV6_PATH)/$(HOSTTYPE)
-test: build test/lurettetop
+test: build
cd test; make test
install:
diff --git a/src/lv6version.ml b/src/lv6version.ml
index 70d9e7b6..9b33eac3 100644
--- a/src/lv6version.ml
+++ b/src/lv6version.ml
@@ -1,7 +1,7 @@
(** Automatically generated from Makefile *)
let tool = "lus2lic"
let branch = "(no"
-let commit = "428"
-let sha_1 = "0565145f94a5b91ac83c5abd65a0fcf72f77ea46"
+let commit = "429"
+let sha_1 = "f3e95c52418aad2cf9a5fde6d7054c2df27f05a9"
let str = (branch ^ "." ^ commit ^ " (" ^ sha_1 ^ ")")
let maintainer = "jahier@imag.fr"
diff --git a/src/socExec.ml b/src/socExec.ml
index 42b7e2db..60b68e80 100644
--- a/src/socExec.ml
+++ b/src/socExec.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 04/12/2013 (at 09:45) by Erwan Jahier> *)
+(* Time-stamp: <modified the 06/12/2013 (at 15:36) by Erwan Jahier> *)
open Soc
open Data
@@ -294,16 +294,18 @@ let (add_data_subst : var list -> Data.subst list -> SocExecValue.substs -> SocE
let s = unexpand_profile s vntl_i in
List.fold_left (fun acc (id,v) -> sadd acc [id] v) ctx_s s
-let (read_soc_input : var list -> Data.vntl -> out_channel -> substs -> substs) =
- fun vntl_i exp_vntl_i_str oc ctx_s ->
- let s:Data.subst list = RifIO.read stdin (Some oc) exp_vntl_i_str in
+let (read_soc_input : Lv6MainArgs.t -> var list -> Data.vntl -> out_channel -> substs -> substs) =
+ fun opt vntl_i exp_vntl_i_str oc ctx_s ->
+ let s:Data.subst list =
+ RifIO.read stdin (if opt.rif then None else Some oc) exp_vntl_i_str
+ in
add_data_subst vntl_i s ctx_s
let rec (loop_step : Lv6MainArgs.t -> Soc.tbl -> Soc.var list -> Data.vntl -> Data.vntl
-> Soc.t -> SocExecValue.ctx -> int -> out_channel -> unit) =
fun opt soc_tbl vntl_i exp_vntl_i_str exp_vntl_o_str soc ctx step_nb oc ->
if not opt.rif then RifIO.write oc ("\n#step " ^ (string_of_int step_nb)^"\n");
- let ctx = { ctx with s = read_soc_input vntl_i exp_vntl_i_str oc ctx.s } in
+ let ctx = { ctx with s = read_soc_input opt vntl_i exp_vntl_i_str oc ctx.s } in
let step = match soc.step with [step] -> step | _ -> assert false in
let ctx = soc_step step soc_tbl soc ctx in
let ctx = { ctx with s = sadd ctx.s ("$first_step"::ctx.cpath) (B false)} in
diff --git a/test/Makefile b/test/Makefile
index 711c0e58..fad28708 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,8 +8,6 @@ OCAMLRUNPARAM=s=1M,i=32M,o=150
# to perform the test on the local machine rather than on $(TEST_MACHINE)
ltest: runtest lus2lic.diff lus2lic.time
-xxxxx:
- ssh $(TEST_MACHINE) "cd $(testdir) ; export OCAMLRUNPARAM=i=32M,o=150 ;../utils/test_lus2lic_no_node should_work/nc6.lus "
testdir=$(shell pwd)
diff --git a/test/lus2lic.log.ref b/test/lus2lic.log.ref
index 7058ecef..28f3b195 100644
--- a/test/lus2lic.log.ref
+++ b/test/lus2lic.log.ref
@@ -1,4 +1,4 @@
-Test Run By jahier on Wed Dec 4 16:43:11 2013
+Test Run By jahier on Wed Dec 4 16:52:45 2013
Native configuration is i686-pc-linux-gnu
=== lus2lic tests ===
@@ -1592,6 +1592,7 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
lurettetop ok
++ exit 0
PASS: ../utils/test_lus2lic_no_node should_work/cst.lus
spawn ./lus2lic -o /tmp/minmax5_random.lic should_work/minmax5_random.lus
PASS: ./lus2lic {-o /tmp/minmax5_random.lic should_work/minmax5_random.lus}
@@ -1643,6 +1644,7 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
lurettetop ok
++ exit 0
PASS: ../utils/test_lus2lic_no_node should_work/matrice2.lus
spawn ./lus2lic -o /tmp/v1.lic should_work/v1.lus
PASS: ./lus2lic {-o /tmp/v1.lic should_work/v1.lus}
@@ -2127,6 +2129,7 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
lurettetop ok
++ exit 0
PASS: ../utils/test_lus2lic_no_node should_work/minmax3.lus
spawn ./lus2lic -o /tmp/filter.lic should_work/filter.lus
PASS: ./lus2lic {-o /tmp/filter.lic should_work/filter.lus}
@@ -2334,6 +2337,7 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
lurettetop ok
++ exit 0
PASS: ../utils/test_lus2lic_no_node should_work/minmax2.lus
spawn ./lus2lic -o /tmp/plus.lic should_work/plus.lus
PASS: ./lus2lic {-o /tmp/plus.lic should_work/plus.lus}
@@ -2397,6 +2401,7 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
lurettetop ok
++ exit 0
PASS: ../utils/test_lus2lic_no_node should_work/xx.lus
spawn ./lus2lic -o /tmp/call07.lic should_work/call07.lus
PASS: ./lus2lic {-o /tmp/call07.lic should_work/call07.lus}
@@ -2670,7 +2675,8 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
lurettetop ok
-+ exitPASS: ../utils/test_lus2lic_no_node should_work/test_diese.lus
++ exit 0
+PASS: ../utils/test_lus2lic_no_node should_work/test_diese.lus
spawn ./lus2lic -o /tmp/tri.lic should_work/tri.lus
PASS: ./lus2lic {-o /tmp/tri.lic should_work/tri.lus}
spawn ./lus2lic -ec -o /tmp/tri.ec should_work/tri.lus
@@ -3329,7 +3335,8 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
lurettetop ok
-+ PASS: ../utils/test_lus2lic_no_node should_work/mm3.lus
++ exit 0
+PASS: ../utils/test_lus2lic_no_node should_work/mm3.lus
spawn ./lus2lic -o /tmp/over2.lic should_work/over2.lus
PASS: ./lus2lic {-o /tmp/over2.lic should_work/over2.lus}
spawn ./lus2lic -ec -o /tmp/over2.ec should_work/over2.lus
@@ -3927,6 +3934,11 @@ Lurette launched a process that failed (exit 2).
break signal catched
lurettetop: bye!
+Error in startup script: no such variable
+ (read trace on "::env(LUSTRE_INSTALL)")
+ invoked from within
+"load $::env(LUSTRE_INSTALL)/tcl/simec.so"
+ (file "/home/jahier/lurette/bin/simec" line 2)
+ echo error
error
+ exit 2
@@ -3993,8 +4005,7 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
lurettetop ok
-+ exit 0
-PASS: ../utils/test_lus2lic_no_node should_work/long_et_stupide_nom_de_noeud.lus
++ PASS: ../utils/test_lus2lic_no_node should_work/long_et_stupide_nom_de_noeud.lus
spawn ./lus2lic -o /tmp/CURRENT.lic should_work/CURRENT.lus
PASS: ./lus2lic {-o /tmp/CURRENT.lic should_work/CURRENT.lus}
spawn ./lus2lic -ec -o /tmp/CURRENT.ec should_work/CURRENT.lus
@@ -5637,8 +5648,6 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
-lurettetop ok
-+ exit 0
PASS: ../utils/test_lus2lic_no_node should_work/minmax4_bis.lus
spawn ./lus2lic -o /tmp/test_struct.lic should_work/test_struct.lus
PASS: ./lus2lic {-o /tmp/test_struct.lic should_work/test_struct.lus}
@@ -7038,6 +7047,7 @@ break signal catched
lurettetop: bye!
+ echo lurettetop ok
lurettetop ok
++ exit 0
PASS: ../utils/test_lus2lic_no_node should_work/trivial2.lus
spawn ./lus2lic -o /tmp/param_node.lic should_work/param_node.lus
PASS: ./lus2lic {-o /tmp/param_node.lic should_work/param_node.lus}
@@ -7902,7 +7912,7 @@ lurettetop: bye!
error
+ exit 2
XPASS: Test bad programs (assert): test_lus2lic_no_node should_fail/assert/eq1.lus
-testcase ./lus2lic.tests/non-reg.exp completed in 99 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 102 seconds
Running ./lus2lic.tests/progression.exp ...
spawn ./lus2lic -o /tmp/when_not.out should_work/broken/when_not.lus
PASS: ./lus2lic { -o /tmp/when_not.out should_work/broken/when_not.lus}
@@ -7939,7 +7949,7 @@ spawn ./lus2lic -o /tmp/activation1.lic should_fail/semantics/broken/activation1
XPASS: Test bad programs (semantics): lus2lic {-o /tmp/activation1.lic should_fail/semantics/broken/activation1.lus}
spawn ./lus2lic -o /tmp/bug.lic should_fail/semantics/broken/bug.lus
XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/semantics/broken/bug.lus}
-testcase ./lus2lic.tests/progression.exp completed in 0 seconds
+testcase ./lus2lic.tests/progression.exp completed in 1 seconds
=== lus2lic Summary ===
@@ -7947,4 +7957,4 @@ testcase ./lus2lic.tests/progression.exp completed in 0 seconds
# of unexpected failures 76
# of unexpected successes 21
# of expected failures 37
-runtest completed at Wed Dec 4 16:44:50 2013
+runtest completed at Wed Dec 4 16:54:28 2013
diff --git a/test/lus2lic.sum b/test/lus2lic.sum
index 96f12c56..92c0e9fe 100644
--- a/test/lus2lic.sum
+++ b/test/lus2lic.sum
@@ -1,4 +1,4 @@
-Test Run By jahier on Wed Dec 4 16:43:11 2013
+Test Run By jahier on Fri Dec 6 17:53:28 2013
Native configuration is i686-pc-linux-gnu
=== lus2lic tests ===
@@ -1030,3 +1030,5 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman
# of expected failures 37
testcase ./lus2lic.tests/non-reg.exp completed in 99 seconds
testcase ./lus2lic.tests/progression.exp completed in 0 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 99 seconds
+testcase ./lus2lic.tests/progression.exp completed in 0 seconds
diff --git a/test/lus2lic.tests/progression.exp b/test/lus2lic.tests/progression.exp
index 473153d5..c2e8336f 100644
--- a/test/lus2lic.tests/progression.exp
+++ b/test/lus2lic.tests/progression.exp
@@ -1,6 +1,6 @@
# Timeout reduced to 3 seconds
-set timeout 3
+set timeout 20
#set command_line "~/lus2lic/objlinux/lus2lic"
diff --git a/test/site.exp b/test/site.exp
index 60015ba4..2e42ca5a 100644
--- a/test/site.exp
+++ b/test/site.exp
@@ -2,6 +2,9 @@ set lus2lic "./lus2lic"
set ec2c "./ec2c"
set ec2c "./myec2c"
set test_lus2lic_no_node "../utils/test_lus2lic_no_node"
+
+set timeout 1000
+
proc should_work { test_name command_line args } {
global verbose
diff --git a/utils/test_lus2lic_no_node b/utils/test_lus2lic_no_node
index b946f775..3e12738e 100755
--- a/utils/test_lus2lic_no_node
+++ b/utils/test_lus2lic_no_node
@@ -1,5 +1,8 @@
#!/bin/sh
+# compares with lurette the results of:
+# lus2lic -ec and ecexe
+# lus2lic -exec
lustre_file=$1
node=`basename $lustre_file .lus`
--
GitLab