From b6d7942c9699d714f2368ad5adc2cd0533c4dc08 Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Tue, 13 Sep 2022 17:39:12 +0200
Subject: [PATCH] [ci] add apron suite
---
.gitlab-ci.yml | 10 +++++++++-
nix/mlmpfr.nix | 4 ++--
nix/pkgs.nix | 1 +
nix/why3.nix | 2 ++
4 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4604ae0ffc7..b7ee6c797ec 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,7 +107,15 @@ eva-domains:
<<: *eva_template
parallel:
matrix:
- - CONFIG: ["bitwise","equality","gauges","multidim","octagon","symblocs"]
+ - CONFIG: [
+ "apron",
+ "bitwise",
+ "equality",
+ "gauges",
+ "multidim",
+ "octagon",
+ "symblocs"
+ ]
kernel-tests:
stage: tests
diff --git a/nix/mlmpfr.nix b/nix/mlmpfr.nix
index a10f2eb751d..b4f93b4a874 100644
--- a/nix/mlmpfr.nix
+++ b/nix/mlmpfr.nix
@@ -8,7 +8,7 @@
buildDunePackage rec {
pname = "mlmpfr";
- version = "4.1.0-bugfix1";
+ version = "4.1.0-bugfix2";
minimumOCamlVersion = "4.04";
@@ -16,7 +16,7 @@ buildDunePackage rec {
owner = "thvnx";
repo = pname;
rev = pname+"."+version;
- sha256 = "13n6spgz5p6jhpjackvfsn33iinpadgr3v4gm63d5195mi9fgn8d";
+ sha256 = "19g26jv6cjinpl5pcjif1ldyaagxlandp3qjajsy8srqg4a5rg0d";
};
buildInputs = [ gmp mpfr ];
diff --git a/nix/pkgs.nix b/nix/pkgs.nix
index 5d9239ba765..91e9de7a7fd 100644
--- a/nix/pkgs.nix
+++ b/nix/pkgs.nix
@@ -33,6 +33,7 @@ let
default-config-tests = oself.callPackage ./default-config-tests.nix {};
e-acsl-tests = oself.callPackage ./e-acsl-tests.nix {};
eva-default-tests = oself.callPackage ./eva-tests.nix { config = ""; };
+ eva-apron-tests = oself.callPackage ./eva-tests.nix { config = "apron" ; };
eva-bitwise-tests = oself.callPackage ./eva-tests.nix { config = "bitwise" ; };
eva-equality-tests = oself.callPackage ./eva-tests.nix { config = "equality" ; };
eva-gauges-tests = oself.callPackage ./eva-tests.nix { config = "gauges" ; };
diff --git a/nix/why3.nix b/nix/why3.nix
index 72981935f29..b230ca26fab 100644
--- a/nix/why3.nix
+++ b/nix/why3.nix
@@ -9,6 +9,7 @@
, zarith
, menhir
, menhirLib
+, mlmpfr
, js_of_ocaml
, js_of_ocaml-ppx
, ppx_deriving
@@ -40,6 +41,7 @@ stdenv.mkDerivation rec {
zarith
menhir
menhirLib
+ mlmpfr
# Emacs compilation of why3.el
emacs
# Documentation
--
GitLab