Commit fd3acf61 authored by erwan's avatar erwan

Update: Adapt the test to the changes done during the rdbg dune migration

cd rdbg #sha 4a54c7a1181e1200670f3eaf14af1be32823cd04
parent eed2b5f5
...@@ -64,8 +64,14 @@ opam-rel : ...@@ -64,8 +64,14 @@ opam-rel :
opam-test : opam-test :
make-opam-pack $(NAME) -test make-opam-pack $(NAME) -test
###############################
# pushing onto the official repo
WWW="/import/www/DIST-TOOLS/SYNCHRONE"
OPAM_FILE=$(shell find $(WWW)/opam-repository/packages/$(NAME) -name opam -cnewer opam | head -1 | sed -e 's/^./\U&/')
OPAM_DIR=`dirname $(OPAM_FILE)`
opam-pr: opam-pr:
cp -rf $(OPAM_DIR) /home/jahier/local/opam-repository/packages/lutin/ cp -r $(OPAM_DIR) /home/jahier/local/opam-repository/packages/$(NAME)
.PHONY:install $(WWW)/pool/$(PACKNAME).tgz $(WWWTEST)/pool/$(PACKNAME).tgz .PHONY:install $(WWW)/pool/$(PACKNAME).tgz $(WWWTEST)/pool/$(PACKNAME).tgz
...@@ -78,3 +84,4 @@ clean: ...@@ -78,3 +84,4 @@ clean:
rm -f setup.data rm -f setup.data
cd polka; make clean cd polka; make clean
cd lutin-utils/src/ ; make clean cd lutin-utils/src/ ; make clean
cd examples/; make clean
...@@ -26,7 +26,7 @@ SourceRepository "master" ...@@ -26,7 +26,7 @@ SourceRepository "master"
Executable lutin Executable lutin
Path: lutin/src Path: lutin/src
MainIs: main.ml MainIs: main.ml
BuildDepends: str,unix,num,rdbg-plugin (>= 1.177),lutin-utils,ezdl,gbddml,polka,camlidl,gmp BuildDepends: str,unix,num,rdbg,lutin-utils,ezdl,gbddml,polka,camlidl,gmp
NativeOpt: -w A -package num # XXX turn around a bug in oasis/ocamlbuild/ocamlfind? NativeOpt: -w A -package num # XXX turn around a bug in oasis/ocamlbuild/ocamlfind?
Build: true Build: true
Install:true Install:true
...@@ -36,7 +36,7 @@ Executable lutin ...@@ -36,7 +36,7 @@ Executable lutin
Executable "lutin.dbg" Executable "lutin.dbg"
Path: lutin/src Path: lutin/src
MainIs: main.ml MainIs: main.ml
BuildDepends: str,unix,num,rdbg-plugin (>= 1.177),lutin-utils,ezdl,gbddml,polka,camlidl,gmp BuildDepends: str,unix,num,rdbg,lutin-utils,ezdl,gbddml,polka,camlidl,gmp
NativeOpt: -w A -package num # XXX turn around a bug in oasis/ocamlbuild/ocamlfind? NativeOpt: -w A -package num # XXX turn around a bug in oasis/ocamlbuild/ocamlfind?
Build: true Build: true
Install:false Install:false
...@@ -79,7 +79,7 @@ Library bddrand ...@@ -79,7 +79,7 @@ Library bddrand
# Path: lutin/src # Path: lutin/src
# Modules: Lut4c # Modules: Lut4c
# FindlibParent: lutin # FindlibParent: lutin
# BuildDepends: str,unix,num,rdbg-plugin (>= 1.51),lutin-utils,ezdl,gbddml,polka # BuildDepends: str,unix,num,rdbg,lutin-utils,ezdl,gbddml,polka
# Install: true # Install: true
# CSources: lut4c_stubs.h,lut4c_stubs.c # CSources: lut4c_stubs.h,lut4c_stubs.c
# CCOpt: -fPIC # CCOpt: -fPIC
...@@ -97,11 +97,9 @@ Library "lutin-utils" ...@@ -97,11 +97,9 @@ Library "lutin-utils"
Executable lurette Executable lurette
Path: lurette-nocaml/src Path: lurette-nocaml/src
MainIs: lurette.ml MainIs: lurette.ml
BuildDepends: str,unix,num,dynlink,extlib,lutils (>= 1.9),lutin-utils,ezdl,gbddml,polka,camlidl,gmp,rdbg-plugin (>= 1.177),lustre-v6,lutin BuildDepends: str,num,dynlink,extlib,lutils (>= 1.9),lutin-utils,ezdl,gbddml,polka,camlidl,gmp,rdbg,lustre-v6,lutin
NativeOpt: rdbg4lurette.cmxa # for some reasons not recognized as a package
Install:true Install:true
CompiledObject: native CompiledObject: native
Install: true
CClib: -lcamlidl CClib: -lcamlidl
......
# OASIS_START # OASIS_START
# DO NOT EDIT (digest: f759eb347702183ade01862b0052cda7) # DO NOT EDIT (digest: 49eff0d7ab0fb991e05d54ceacda33a1)
# Ignore VCS directories, you can use the same kind of rule outside # Ignore VCS directories, you can use the same kind of rule outside
# OASIS_START/STOP if you want to exclude directories that contains # OASIS_START/STOP if you want to exclude directories that contains
# useless stuff for the build process # useless stuff for the build process
...@@ -91,8 +91,6 @@ true: annot, bin_annot ...@@ -91,8 +91,6 @@ true: annot, bin_annot
<lutin/src/*.ml{,i,y}>: package(lutils) <lutin/src/*.ml{,i,y}>: package(lutils)
# Executable lurette # Executable lurette
"lurette-nocaml/src/lurette.native": oasis_executable_lurette_cclib "lurette-nocaml/src/lurette.native": oasis_executable_lurette_cclib
"lurette-nocaml/src/lurette.native": oasis_executable_lurette_native
<lurette-nocaml/src/*.ml{,i,y}>: oasis_executable_lurette_native
"lurette-nocaml/src/lurette.native": package(bigarray) "lurette-nocaml/src/lurette.native": package(bigarray)
"lurette-nocaml/src/lurette.native": package(camlidl) "lurette-nocaml/src/lurette.native": package(camlidl)
"lurette-nocaml/src/lurette.native": package(dynlink) "lurette-nocaml/src/lurette.native": package(dynlink)
...@@ -101,9 +99,8 @@ true: annot, bin_annot ...@@ -101,9 +99,8 @@ true: annot, bin_annot
"lurette-nocaml/src/lurette.native": package(lustre-v6) "lurette-nocaml/src/lurette.native": package(lustre-v6)
"lurette-nocaml/src/lurette.native": package(lutils) "lurette-nocaml/src/lurette.native": package(lutils)
"lurette-nocaml/src/lurette.native": package(num) "lurette-nocaml/src/lurette.native": package(num)
"lurette-nocaml/src/lurette.native": package(rdbg-plugin) "lurette-nocaml/src/lurette.native": package(rdbg)
"lurette-nocaml/src/lurette.native": package(str) "lurette-nocaml/src/lurette.native": package(str)
"lurette-nocaml/src/lurette.native": package(unix)
"lurette-nocaml/src/lurette.native": use_ezdl "lurette-nocaml/src/lurette.native": use_ezdl
"lurette-nocaml/src/lurette.native": use_gbddml "lurette-nocaml/src/lurette.native": use_gbddml
"lurette-nocaml/src/lurette.native": use_lutin "lurette-nocaml/src/lurette.native": use_lutin
...@@ -117,9 +114,8 @@ true: annot, bin_annot ...@@ -117,9 +114,8 @@ true: annot, bin_annot
<lurette-nocaml/src/*.ml{,i,y}>: package(lustre-v6) <lurette-nocaml/src/*.ml{,i,y}>: package(lustre-v6)
<lurette-nocaml/src/*.ml{,i,y}>: package(lutils) <lurette-nocaml/src/*.ml{,i,y}>: package(lutils)
<lurette-nocaml/src/*.ml{,i,y}>: package(num) <lurette-nocaml/src/*.ml{,i,y}>: package(num)
<lurette-nocaml/src/*.ml{,i,y}>: package(rdbg-plugin) <lurette-nocaml/src/*.ml{,i,y}>: package(rdbg)
<lurette-nocaml/src/*.ml{,i,y}>: package(str) <lurette-nocaml/src/*.ml{,i,y}>: package(str)
<lurette-nocaml/src/*.ml{,i,y}>: package(unix)
<lurette-nocaml/src/*.ml{,i,y}>: use_ezdl <lurette-nocaml/src/*.ml{,i,y}>: use_ezdl
<lurette-nocaml/src/*.ml{,i,y}>: use_gbddml <lurette-nocaml/src/*.ml{,i,y}>: use_gbddml
<lurette-nocaml/src/*.ml{,i,y}>: use_lutin <lurette-nocaml/src/*.ml{,i,y}>: use_lutin
...@@ -132,7 +128,7 @@ true: annot, bin_annot ...@@ -132,7 +128,7 @@ true: annot, bin_annot
"lutin/src/main.byte": package(camlidl) "lutin/src/main.byte": package(camlidl)
"lutin/src/main.byte": package(gmp) "lutin/src/main.byte": package(gmp)
"lutin/src/main.byte": package(num) "lutin/src/main.byte": package(num)
"lutin/src/main.byte": package(rdbg-plugin) "lutin/src/main.byte": package(rdbg)
"lutin/src/main.byte": package(str) "lutin/src/main.byte": package(str)
"lutin/src/main.byte": package(unix) "lutin/src/main.byte": package(unix)
"lutin/src/main.byte": use_ezdl "lutin/src/main.byte": use_ezdl
...@@ -146,7 +142,7 @@ true: annot, bin_annot ...@@ -146,7 +142,7 @@ true: annot, bin_annot
"lutin/src/main.native": package(camlidl) "lutin/src/main.native": package(camlidl)
"lutin/src/main.native": package(gmp) "lutin/src/main.native": package(gmp)
"lutin/src/main.native": package(num) "lutin/src/main.native": package(num)
"lutin/src/main.native": package(rdbg-plugin) "lutin/src/main.native": package(rdbg)
"lutin/src/main.native": package(str) "lutin/src/main.native": package(str)
"lutin/src/main.native": package(unix) "lutin/src/main.native": package(unix)
"lutin/src/main.native": use_ezdl "lutin/src/main.native": use_ezdl
...@@ -156,7 +152,7 @@ true: annot, bin_annot ...@@ -156,7 +152,7 @@ true: annot, bin_annot
<lutin/src/*.ml{,i,y}>: package(camlidl) <lutin/src/*.ml{,i,y}>: package(camlidl)
<lutin/src/*.ml{,i,y}>: package(gmp) <lutin/src/*.ml{,i,y}>: package(gmp)
<lutin/src/*.ml{,i,y}>: package(num) <lutin/src/*.ml{,i,y}>: package(num)
<lutin/src/*.ml{,i,y}>: package(rdbg-plugin) <lutin/src/*.ml{,i,y}>: package(rdbg)
<lutin/src/*.ml{,i,y}>: package(str) <lutin/src/*.ml{,i,y}>: package(str)
<lutin/src/*.ml{,i,y}>: package(unix) <lutin/src/*.ml{,i,y}>: package(unix)
<lutin/src/*.ml{,i,y}>: use_ezdl <lutin/src/*.ml{,i,y}>: use_ezdl
......
...@@ -13,6 +13,17 @@ test: ...@@ -13,6 +13,17 @@ test:
cd StimulusLib/ && make test; cd StimulusLib/ && make test;
echo "All lutin tests ran correctly." echo "All lutin tests ran correctly."
clean:
cd up_and_down && make clean;
# cd lutin/test_ok && make clean;
cd call-luciole && make clean ;
cd from_ocaml && make clean;
cd external_code && make clean;
cd call-luciole && make clean ;
cd crazy-rabbit && make clean;
cd StimulusLib/ && make clean;
echo "All lutin cleans ran correctly."
# XXX Broken ! # XXX Broken !
# cd lutin/lustre && make test ; # cd lutin/lustre && make test ;
# cd lutin/C && make test; # cd lutin/C && make test;
......
export OCAMLOPT=ocamlopt export OCAMLOPT=ocamlopt
LTOP=lurette_old
LIB= `ocamlfind query -r rdbg-plugin -i-format` \
`ocamlfind query -r lutin -i-format`
MAIN=rabbit MAIN=rabbit
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 LURETTE=lurette --test-length 500
EXPDIR=`$(LTOP) --ocaml-version` EXPDIR=`lutin --ocaml-version`
$(EXPDIR): $(EXPDIR):
[ -d $(EXPDIR) ] || (mkdir -p $(EXPDIR) ; make utest) [ -d $(EXPDIR) ] || (mkdir -p $(EXPDIR) ; make utest)
CMXA=$(shell ocamlfind query lutin -a-format -r -predicates native)
%.cmxs: %.ml %.cmxs: %.ml
ocamlfind ocamlopt -shared -o $*.cmxs $(LIB) $(CMXA) rdbg-plugin.cmxa graphics.cmxa $*.ml ocamlfind ocamlopt -shared -o $*.cmxs -package rdbg graphics.cmxa $*.ml
clean: clean:
rm -rf *.ec *.cm* *.log *~ .*~ *.o *rif0 *rif Data *.pp_luc *.plot *.gp $(MAIN).opt rm -rf *.ec *.cm* *.log *~ .*~ *.o *rif0 *rif Data *.pp_luc *.plot *.gp $(MAIN).opt
test_old.rif:$(EXPDIR) rabbit.cmxs
rm -f test_old.rif0 .lurette_rc
$(LURETTETOP) -go --output test_old.rif0 \
-rp "sut:ocaml:rabbit.cmxs:" \
-rp 'env:lutin:rabbit.lut:-main:rabbit:-seed:34:-L:libm.so.6:-loc' && \
grep -v "lurette chronogram" test_old.rif0 | \
grep -v "lurette Version" | \
grep -v "#seed" | \
grep -v "The execution lasted"| sed -e "s/^M//" > test_old.rif
test_old: test_old.rif $(EXPDIR)
rm -f test_old1.res
diff -B -u -i $(EXPDIR)/test_old.rif.exp test_old.rif > test_old.res || true
cat test_old.res
[ ! -s test_old.res ] && make clean
utest_old:test_old.rif
cp test_old.rif $(EXPDIR)/test_old.rif.exp
test_new.rif:$(EXPDIR) rabbit.cmxs test_new.rif:$(EXPDIR) rabbit.cmxs
rm -f test_new.rif0 .lurette_rc rm -f test_new.rif0 .lurette_rc
$(LURETTE) --output test_new.rif0 \ $(LURETTE) --output test_new.rif0 \
...@@ -59,7 +29,6 @@ test_new.rif:$(EXPDIR) rabbit.cmxs ...@@ -59,7 +29,6 @@ test_new.rif:$(EXPDIR) rabbit.cmxs
test: 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 diff -B -u -i $(EXPDIR)/test_new.rif.exp test_new.rif > test_new.res || true
cat test_new.res cat test_new.res
[ ! -s test_new.res ] && make clean [ ! -s test_new.res ] && make clean
......
...@@ -15,13 +15,13 @@ endif ...@@ -15,13 +15,13 @@ endif
# XXX pack all those modules into one # XXX pack all those modules into one
CMXA_LIB = dynlink.cmxa unix.cmxa nums.cmxa str.cmxa \ CMXA_LIB = dynlink.cmxa unix.cmxa nums.cmxa str.cmxa \
ezdl.cmxa gbddml.cmxa polka.cmxa \ ezdl.cmxa gbddml.cmxa polka.cmxa \
lutils.cmxa rdbg-plugin.cmxa lutin-utils.cmxa lutin.cmxa lutils.cmxa rdbg.cmxa lutin-utils.cmxa lutin.cmxa
CLIB= `ocamlfind query -r rdbg-plugin -i-format` \ CLIB= `ocamlfind query -r rdbg -i-format` \
`ocamlfind query -r lutin -i-format` \ `ocamlfind query -r lutin -i-format` \
-cclib -lcamlidl -cclib -lgmp -cclib -lcamlidl -cclib -lgmp
INCLUDE_DIR = -I +gmp -I +camlidl -I +polka -I +gbddml \ INCLUDE_DIR = -I +gmp -I +camlidl -I +polka -I +gbddml \
-I +rdbg-plugin -I +lutin \ -I +rdbg -I +lutin \
-I +ezdl -I +ezdl
LUTIN=lutin$(EXE) LUTIN=lutin$(EXE)
...@@ -33,6 +33,10 @@ MAIN=call_foo ...@@ -33,6 +33,10 @@ MAIN=call_foo
$(MAIN).opt:$(MAIN).ml $(MAIN).opt:$(MAIN).ml
ocamlfind ocamlopt -cc g++ $(CLIB) $(INCLUDE_DIR) $(CMXA_LIB) $(MAIN).ml -o $(MAIN).opt ocamlfind ocamlopt -cc g++ $(CLIB) $(INCLUDE_DIR) $(CMXA_LIB) $(MAIN).ml -o $(MAIN).opt
$(MAIN).opt_alt:$(MAIN).ml
ocamlfind ocamlopt -package rdbg,lutin $(MAIN).ml -o $(MAIN).opt
$(MAIN):$(MAIN).ml $(MAIN):$(MAIN).ml
ocamlfind ocamlc.opt $(INCLUDE_DIR) graphics.cma $(CMA_LIB) $(MAIN).ml -o $(MAIN) ocamlfind ocamlc.opt $(INCLUDE_DIR) graphics.cma $(CMA_LIB) $(MAIN).ml -o $(MAIN)
......
...@@ -6,8 +6,9 @@ let oc = open_out "call_foo.rif" ...@@ -6,8 +6,9 @@ let oc = open_out "call_foo.rif"
(* node main(a:int; b:bool; c:real) returns ( x:int; y:bool; z:real) = *) (* node main(a:int; b:bool; c:real) returns ( x:int; y:bool; z:real) = *)
(* open Rdbg *)
open Data open Data
open RdbgPlugin open RdbgPlugin
let _ = let _ =
let inputs, outputs, kill, step, step_dbg, mems_i,mems_o = let inputs, outputs, kill, step, step_dbg, mems_i,mems_o =
......
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