From 6244931a8922cc2ecd69ea4481c6b4c957fec9fe Mon Sep 17 00:00:00 2001 From: Thibault Martin <thi.martin.pro@pm.me> Date: Thu, 3 Oct 2024 18:04:08 +0200 Subject: [PATCH] [ci] Add Frama-Clang and Minimal to internal plugin tests --- nix/external-plugins.txt | 2 ++ nix/internal-tests.nix | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/nix/external-plugins.txt b/nix/external-plugins.txt index 62b9bf97aa0..2fda981d009 100644 --- a/nix/external-plugins.txt +++ b/nix/external-plugins.txt @@ -1,8 +1,10 @@ acsl-importer git@git.frama-c.com:frama-c/acsl-importer.git caveat-importer git@git.frama-c.com:frama-c/caveat-importer.git context-from-precondition git@git.frama-c.com:frama-c/context-from-precondition.git +frama-clang git@git.frama-c.com:frama-c/frama-clang.git genassigns git@git.frama-c.com:frama-c/genassigns.git meta git@git.frama-c.com:frama-c/meta.git +minimal git@git.frama-c.com:frama-c/minimal.git mthread git@git.frama-c.com:frama-c/mthread.git security git@git.frama-c.com:frama-c/security.git volatile git@git.frama-c.com:frama-c/volatile.git diff --git a/nix/internal-tests.nix b/nix/internal-tests.nix index 7fcfc01bc5b..822b36e598e 100644 --- a/nix/internal-tests.nix +++ b/nix/internal-tests.nix @@ -11,6 +11,12 @@ , writeText # Generic , findlib +# Frama-Clang +, cmake +, camlp5 +, camlp-streams +, gnused +, llvmPackages # Frama-C build , apron , camlzip @@ -68,6 +74,9 @@ stdenvNoCC.mkDerivation rec { src = gitignoreSource ./..; + # Prevent CMake from doing stuff without being asked + dontUseCmakeConfigure=true; + nativeBuildInputs = [ which wrapGAppsHook @@ -75,18 +84,24 @@ stdenvNoCC.mkDerivation rec { buildInputs = [ apron + camlp5 + camlp-streams camlzip camomile clang + cmake dune_3 dune-configurator dune-site findlib fpath gcc9 + gnused graphviz lablgtk3 lablgtk3-sourceview3 + llvmPackages.llvm.dev + llvmPackages.clang-unwrapped.dev ltl2ba menhir menhirLib -- GitLab