From 00fc5bd08fc7c5149c50895a5f5d15e9db171c02 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Tue, 14 May 2019 18:27:51 +0200 Subject: [PATCH] simgrid: override checkPhase -> preCheck This commit changes how failing tests are ignored. - Previously, the whole checkPhase was overridden. - Now, preCheck generates a ctest ignore file. ctest doc: https://gitlab.kitware.com/cmake/community/wikis/doc/ctest/Testing-With-CTest#customizing-ctest --- pkgs/applications/science/misc/simgrid/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 43b6f294cdc..5272e3d8418 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -86,13 +86,11 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = '' - runHook preCheck - - make tests -j $NIX_BUILD_CORES - ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple - - runHook postCheck + # Prevent the execution of tests known to fail. + preCheck = '' + cat <CTestCustom.cmake + SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple) + EOW ''; enableParallelBuilding = true;