From 146b5e76a93faf0aaf23fe3ffe7fc95ceff99561 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Fri, 10 Mar 2023 11:12:20 +0100
Subject: [PATCH] [nix] ask dune to output errors also at the end of the log
on longer log (i.e. frama-c or plug-in compilation), it can be quite
tedious to check the log in the CI to spot the error. The new option
will instruct dune to put the error message (and its associated
command line) at the end of the log as well.
---
nix/api-doc.nix | 2 +-
nix/frama-c.nix | 2 +-
nix/internal-tests.nix | 2 +-
nix/mk_plugin.nix | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/nix/api-doc.nix b/nix/api-doc.nix
index ff41a6fa76a..bb0f15e3a52 100644
--- a/nix/api-doc.nix
+++ b/nix/api-doc.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
];
buildPhase = ''
- dune build -j1 @doc
+ dune build -j1 --error-reporting=twice @doc
cp -r _build/default/_doc/_html frama-c-api
echo ".dummy" > excluded
tar czf frama-c-api.tar.gz -X excluded frama-c-api
diff --git a/nix/frama-c.nix b/nix/frama-c.nix
index acb8dbb253f..e24625d7c51 100644
--- a/nix/frama-c.nix
+++ b/nix/frama-c.nix
@@ -110,7 +110,7 @@ stdenvNoCC.mkDerivation rec {
dune_opt = if release_mode then "--release" else "" ;
buildPhase = ''
- dune build -j2 --display short $release_mode @install
+ dune build -j2 --display short --error-reporting=twice $release_mode @install
make tools/ptests/ptests.exe
make tools/ptests/wtests.exe
'';
diff --git a/nix/internal-tests.nix b/nix/internal-tests.nix
index 40dc80c45ce..93af19cb7b6 100644
--- a/nix/internal-tests.nix
+++ b/nix/internal-tests.nix
@@ -115,7 +115,7 @@ stdenvNoCC.mkDerivation rec {
# Do not use default parallel building, but allow 2 cores for Frama-C build
enableParallelBuilding = false;
buildPhase = ''
- dune build -j2 --display short @install
+ dune build -j2 --display short --error-reporting=twice @install
make tools/ptests/ptests.exe
make tools/ptests/wtests.exe
'';
diff --git a/nix/mk_plugin.nix b/nix/mk_plugin.nix
index c23ad7e3ac9..ffd2e0597dd 100644
--- a/nix/mk_plugin.nix
+++ b/nix/mk_plugin.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
'';
buildPhase = ''
runHook preBuild
- dune build -j2 --display short @install
+ dune build -j2 --display short --error-reporting=twice @install
'';
wp_cache =
--
GitLab