From 9b7e9479379e9b45ab9a495e174545ec94e99941 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Tue, 25 Jun 2024 19:30:14 +0200 Subject: [PATCH 1/2] pinocchio: deactivate one failing test --- pkgs/development/libraries/pinocchio/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index 9432722647cac..325d8f48388e8 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -25,8 +25,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-h4NzfS27+jWyHbegxF+pgN6JzJdVAoM16J6G/9uNJc4="; }; - # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 - prePatch = lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + prePatch = '' + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2304 + substituteInPlace unittest/CMakeLists.txt \ + --replace-fail "add_pinocchio_unit_test(contact-cholesky)" "" + '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ --replace-fail "add_pinocchio_unit_test(force)" "" ''; From 54f0f3829c4efaaa4fbd518ee0e412ff78d63b40 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 26 Jun 2024 10:48:15 +0200 Subject: [PATCH 2/2] pinocchio: deactivate one failing test on aarch64 --- pkgs/development/libraries/pinocchio/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/pinocchio/default.nix b/pkgs/development/libraries/pinocchio/default.nix index 325d8f48388e8..470668bb1eb23 100644 --- a/pkgs/development/libraries/pinocchio/default.nix +++ b/pkgs/development/libraries/pinocchio/default.nix @@ -30,6 +30,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace unittest/CMakeLists.txt \ --replace-fail "add_pinocchio_unit_test(contact-cholesky)" "" '' + lib.optionalString (stdenv.isLinux && stdenv.isAarch64) '' + # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2304 + substituteInPlace unittest/CMakeLists.txt \ + --replace-fail "add_pinocchio_unit_test(contact-models)" "" # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277 substituteInPlace unittest/algorithm/utils/CMakeLists.txt \ --replace-fail "add_pinocchio_unit_test(force)" ""