From b2135f092aa15de27fba46923b54432a411c673a Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@cea.fr>
Date: Thu, 5 Sep 2024 14:53:35 +0200
Subject: [PATCH] [ci] add jq as dependencies and refine MdR's libc test
dependencies
---
nix/frama-c.nix | 2 ++
src/plugins/markdown-report/tests/sarif/libc.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/nix/frama-c.nix b/nix/frama-c.nix
index e3949630bab..a5e914062d7 100644
--- a/nix/frama-c.nix
+++ b/nix/frama-c.nix
@@ -24,6 +24,7 @@
, dune-configurator
, dune-site
, fpath
+, jq
, gcc9
, graphviz
, lablgtk3
@@ -87,6 +88,7 @@ stdenvNoCC.mkDerivation rec {
dune-site
findlib
fpath
+ jq
gcc9
graphviz
lablgtk3
diff --git a/src/plugins/markdown-report/tests/sarif/libc.c b/src/plugins/markdown-report/tests/sarif/libc.c
index 7115614f982..ef97cd5c232 100644
--- a/src/plugins/markdown-report/tests/sarif/libc.c
+++ b/src/plugins/markdown-report/tests/sarif/libc.c
@@ -7,7 +7,7 @@
OPT: -mdr-no-print-libc -mdr-out ./without-libc.sarif.unfiltered
EXECNOW: LOG without-libc.sarif sed -e "s:@PTEST_SESSION@:PTEST_SESSION:" %{dep:without-libc.sarif.unfiltered} > without-libc.sarif 2> @DEV_NULL@
- ENABLED_IF: %{bin-available:check-jsonschema}
+ ENABLED_IF: (and %{bin-available:check-jsonschema} %{bin-available:jq})
EXECNOW: LOG with-libc.sarif.checked check-jsonschema --schemafile $(jq '."$schema"' ./with-libc.sarif.unchecked -r) %{dep:with-libc.sarif.unchecked} > ./with-libc.sarif.checked
*/
#include <string.h>
--
GitLab