From 5eb77369fbf571d4a3379bfc86493c24b5780633 Mon Sep 17 00:00:00 2001 From: Sergei Zimmerman Date: Sat, 10 May 2025 20:01:40 +0000 Subject: [PATCH] eztrace: use ctestCheckHook --- pkgs/by-name/ez/eztrace/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ez/eztrace/package.nix b/pkgs/by-name/ez/eztrace/package.nix index a55d917bfde2..6c5a82dde4a1 100644 --- a/pkgs/by-name/ez/eztrace/package.nix +++ b/pkgs/by-name/ez/eztrace/package.nix @@ -9,6 +9,7 @@ libbfd, libopcodes, otf2, + ctestCheckHook, versionCheckHook, }: @@ -54,8 +55,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "EZTRACE_ENABLE_MEMORY" true) - # This test is somewhat flaky and fails once per several rebuilds. - (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;memory_tests") ]; nativeBuildInputs = [ @@ -72,8 +71,13 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; + disabledTests = [ + # This test is somewhat flaky and fails once per several rebuilds. + "memory_tests" + ]; nativeCheckInputs = [ otf2 # `otf2-print` needed by compiler_instrumentation_tests,pthread_tests,posixio_tests + ctestCheckHook ]; postInstall = ''