From 1cdd02fa68f9e860c022537f4dcf5fbdc07034a7 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Mon, 5 Sep 2022 14:07:17 +0200
Subject: [PATCH] ci: fix the salut tests
---
.gitlab-ci.yml | 2 +-
salut.opam | 1 +
salut/test/Makefile.inc | 4 +++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9adfc43c..3f2c36f2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ build:
- opam repo add verimag-sync-repo "http://www-verimag.imag.fr/DIST-TOOLS/SYNCHRONE/opam-repository"
- eval `opam config env`
- sudo apt-get update
- - opam depext sasa rdbgui4sasa kind2 lutin lustre-v6 || echo "not needed for recent opam version"
+ - opam depext sasa rdbgui4sasa kind2 lutin lustre-v6 kind2 z3 || echo "not needed for recent opam version"
- opam install --deps-only ./sasa.opam ./salut.opam ./rdbgui4sasa.opam
- make
- make install
diff --git a/salut.opam b/salut.opam
index adf3a646..2f14dce6 100644
--- a/salut.opam
+++ b/salut.opam
@@ -16,6 +16,7 @@ bug-reports:
"https://gricad-gitlab.univ-grenoble-alpes.fr/verimag/synchrone/sasa/issues"
depends: [
"sasa"
+ "z3"
"kind2" { < "1.6" }
]
build: ["dune" "build"]
diff --git a/salut/test/Makefile.inc b/salut/test/Makefile.inc
index 892b31ff..e2239e9e 100644
--- a/salut/test/Makefile.inc
+++ b/salut/test/Makefile.inc
@@ -31,7 +31,9 @@ genclean:
LIB=-package algo
OCAMLOPT=ocamlfind ocamlopt -bin-annot
-LIB_LUS=$(HOME)/sasa/test/lustre/round.lus $(HOME)/sasa/salut/lib/sas.lus
+
+SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
+LIB_LUS=${SELF_DIR}../../test/lustre/round.lus ${SELF_DIR}../lib/sas.lus
# $(HOME)/sasa/test/lustre/oracle_utils.lus
--
GitLab