From 0c3289a30f676942c08f602ee6716600c099f592 Mon Sep 17 00:00:00 2001 From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr> Date: Mon, 5 Dec 2022 21:11:42 +0100 Subject: [PATCH] ci: opam test failed because it's not a got project --- salut/test/Makefile.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/salut/test/Makefile.inc b/salut/test/Makefile.inc index 7f609710..d7143089 100644 --- a/salut/test/Makefile.inc +++ b/salut/test/Makefile.inc @@ -35,9 +35,9 @@ LIB=-package algo OCAMLOPT=ocamlfind ocamlopt -bin-annot -GITROOT=$(shell git rev-parse --show-toplevel) -LIB_LUS=$(GITROOT)/test/lustre/round.lus $(GITROOT)/salut/lib/sas.lus -RUN_KIND2=$(GITROOT)/salut/test/run-kind2.sh +ROOTDIR=$(shell git rev-parse --show-toplevel || echo "../..") +LIB_LUS=$(ROOTDIR)/test/lustre/round.lus $(ROOTDIR)/salut/lib/sas.lus +RUN_KIND2=$(ROOTDIR)/salut/test/run-kind2.sh ##########################################################################################" # Simulations @@ -74,7 +74,7 @@ RUN_KIND2=$(GITROOT)/salut/test/run-kind2.sh ##########################################################################################" # model-checking with kind2 -# nb: it's probably better to use $(GITROOT)/salut/run-kind2.sh instead +# nb: it's probably better to use $(ROOTDIR)/salut/run-kind2.sh instead ifndef $(prop) prop = verify @@ -136,8 +136,8 @@ endif %_verify.ec: %.dot verify.lus make $*_const.lus lv6 $(LIB_LUS) $*.lus $*_const.lus verify.lus -n $(prop) -ec -o $@.tmp - echo "include \"$(GITROOT)/salut/lib/bit-blast/signed_binary6.lus\"" > $@.tmp2 - echo "include \"$(GITROOT)/salut/lib/bit-blast/binary.lus\"" >> $@.tmp2 + echo "include \"$(ROOTDIR)/salut/lib/bit-blast/signed_binary6.lus\"" > $@.tmp2 + echo "include \"$(ROOTDIR)/salut/lib/bit-blast/binary.lus\"" >> $@.tmp2 ec2ec -usrint $@.tmp >> $@.tmp2 cat $@.tmp2 | tr '\n' '@' |sed "s/tel@/tel/g" | sed "s/@/\\n/g" | sed "s/tel-- end of node verify/--%MAIN ;\n--%PROPERTY ok;\ntel\n/" > $@.tmp mv $@.tmp $@ ; rm $@.tmp2 -- GitLab