From 92f6eb243835683154397fccf2bd890ee34d350f Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 11 Sep 2025 17:43:20 +0100 Subject: [PATCH] wangle: use `ctestCheckHook` --- pkgs/by-name/wa/wangle/package.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix index 7f4aacb50d79..00eb3df88167 100644 --- a/pkgs/by-name/wa/wangle/package.nix +++ b/pkgs/by-name/wa/wangle/package.nix @@ -15,6 +15,8 @@ libevent, double-conversion, + ctestCheckHook, + gtest, nix-update-script, @@ -55,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: { double-conversion ]; + nativeCheckInputs = [ + ctestCheckHook + ]; + checkInputs = [ gtest ]; @@ -90,22 +96,16 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - checkPhase = '' - runHook preCheck + dontUseNinjaCheck = true; - ctest -j $NIX_BUILD_CORES --output-on-failure ${ - # Deterministic glibc abort 🫠 - # SSLContextManagerTest uses 15+ GB of RAM - lib.optionalString stdenv.hostPlatform.isLinux ( - lib.escapeShellArgs [ - "--exclude-regex" - "^(BootstrapTest|BroadcastPoolTest|SSLContextManagerTest)$" - ] - ) - } + disabledTests = [ + # Deterministic glibc abort 🫠 + "BootstrapTest" + "BroadcastPoolTest" - runHook postCheck - ''; + # SSLContextManagerTest uses 15+ GB of RAM + "SSLContextManagerTest" + ]; passthru.updateScript = nix-update-script { };