Commit ad57bc8e authored by Erwan Jahier's avatar Erwan Jahier

The lurette executable now support ocaml plugins

Hence, I now can use lurette instead of lurette_old in the crazy
rabbit nonreg tests.
parent f5332350
Pipeline #10041 passed with stages
in 8 minutes and 57 seconds
......@@ -16,3 +16,4 @@ doc: [
lib: [
"lutin/src/lut4c_stubs.h"
]
\ No newline at end of file
......@@ -110,7 +110,12 @@ opam : $(WWW)/pool/$(PACKNAME).tgz
opam-test : $(WWWTEST)/pool/$(PACKNAME).tgz
cd $(WWWTEST)/opam-repository/packages && \
oasis2opam $(HTTPTEST)/pool/$(PACKNAME).tgz && \
opam-installer Lutin.install --prefix=$(OPAM_DIR) && \
cp $(OPAM_FILE_TEST) $(PWD)/opam.oasis2opam && \
diff -u $(PWD)/opam.oasis2opam $(PWD)/opam | \
grep -v opam.oasis2opam > $(PWD)/opam.diff &&\
diff $(PWD)/opam.diff $(PWD)/opam.diff.exp && \
cp $(PWD)/opam $(OPAM_FILE_TEST) || \
(echo "The opam file needs some update"; exit 2) && \
cd .. ; opam-admin check && opam-admin make -g
# xxxcp ~/lurette/opam $(OPAM_FILE_TEST) && \
......
OASISFormat: 0.4
Name: Lutin
Version: 2.59
Version: 2.60
Authors: Erwan Jahier, Pascal Raymond, Bertrand Jeannnet (polka), Yvan Roux
Maintainers: erwan.jahier@univ-grenoble-alpes.fr
License: CeCILL
......
......@@ -10,6 +10,8 @@ LURETTETOP=$(LTOP) --precision 2 \
--test-length 500 --step-mode Inside --local-var --no-gnuplot --no-sim2chro \
--do-not-show-step -v 2
LURETTE=lurette --test-length 500
EXPDIR=`$(LTOP) --ocaml-version`
$(EXPDIR):
[ -d $(EXPDIR) ] || (mkdir -p $(EXPDIR) ; make utest)
......@@ -18,7 +20,7 @@ $(EXPDIR):
CMXA=$(shell ocamlfind query lutin -a-format -r -predicates native)
%.cmxs: %.ml
ocamlfind ocamlopt -shared -o $*.cmxs $(LIB) $(CMXA) graphics.cmxa $*.ml
ocamlfind ocamlopt -shared -o $*.cmxs $(LIB) $(CMXA) rdbg-plugin.cmxa graphics.cmxa $*.ml
clean:
......@@ -45,12 +47,10 @@ test_old: test_old.rif $(EXPDIR)
utest_old:test_old.rif
cp test_old.rif $(EXPDIR)/test_old.rif.exp
#XXX do the same as in ~/rdbg/exemples/ocaml/Makefile or extend rdbg so that it
# handle ocaml plugins ans generates files that looks like ~/rdbg/exemples/ocaml/test.ml
test_new.rif:$(EXPDIR) rabbit.cmxs
rm -f test_new.rif0 .lurette_rc
rdbg -lurette --output test_new.rif0 \
-sut "ocaml:rabbit.cmxs:" \
$(LURETTE) --output test_new.rif0 \
-sut "ocaml rabbit.cmxs" \
-env "lutin rabbit.lut -main rabbit -seed 34 -L libm.so.6 -loc" && \
grep -v "lurette chronogram" test_new.rif0 | \
grep -v "lurette Version" | \
......@@ -58,19 +58,15 @@ test_new.rif:$(EXPDIR) rabbit.cmxs
grep -v "The execution lasted"| sed -e "s/^M//" > test_new.rif
test_new: test_new.rif $(EXPDIR)
test: test_new.rif $(EXPDIR)
rm -f test_new_old.res
diff -B -u -i $(EXPDIR)/test_new.rif.exp test_new.rif > test_new.res || true
cat test_new.res
[ ! -s test_new.res ] && make clean
utest_new:test_new.rif
utest:test_new.rif
cp test_new.rif $(EXPDIR)/test_new.rif.exp
test: test_old # test_new
utest: utest_old # utest_new
# A FAIRE
#
# 1 - determiner les sommets de l'obstacle avec get_vertices pour pouvoir afficher le vrai obstacle
......
(* Time-stamp: <modified the 04/05/2018 (at 10:39) by Erwan Jahier> *)
(* Time-stamp: <modified the 24/07/2018 (at 16:03) by Erwan Jahier> *)
(* Mimick the behavior of 'rdbg -lurette', but without the dependency
on ocaml *)
open Event
......@@ -56,6 +56,7 @@ let (gen_reactive_program : string -> RdbgArg.reactive_program) =
match tool with
| "lutin" -> LutinRun.make (Array.of_list args)
| "lv6" | "lus2lic" -> Lv6Run.make (Array.of_list (args@["--expand-io-type"]))
| "ocaml" -> OcamlRun.make (List.nth args 1)
| _ -> StdioRun.make str
in
Ocaml(plugin)
......
let str="2.59"
let sha="063e00f4"
let str="2.60"
let sha="f5332350"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment