edencommon: patch to increase test discovery timeout (NixOS#339781)

chriscoffee · Sep 8, 2024 · 92fab67 · 92fab67
2 parents 15ecc60 + 912531f
commit 92fab67
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/pkgs/development/libraries/edencommon/default.nix b/pkgs/development/libraries/edencommon/default.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg=";
   };
 
+  patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+    # Test discovery timeout is bizarrely flaky on `x86_64-darwin`
+    ./increase-test-discovery-timeout.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = lib.optionals stdenv.isDarwin [

diff --git a/pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch b/pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch
@@ -0,0 +1,20 @@
+diff --git a/eden/common/os/test/CMakeLists.txt b/eden/common/os/test/CMakeLists.txt
+index a9f71443f8..be1423c455 100644
+--- a/eden/common/os/test/CMakeLists.txt
++++ b/eden/common/os/test/CMakeLists.txt
+@@ -18,4 +18,4 @@
+     ${LIBGMOCK_LIBRARIES}
+ )
+
+-gtest_discover_tests(os_test)
++gtest_discover_tests(os_test DISCOVERY_TIMEOUT 25)
+diff --git a/eden/common/utils/test/CMakeLists.txt b/eden/common/utils/test/CMakeLists.txt
+index 0cac73e569..ff08ecccb8 100644
+--- a/eden/common/utils/test/CMakeLists.txt
++++ b/eden/common/utils/test/CMakeLists.txt
+@@ -34,4 +34,4 @@
+     ${LIBGMOCK_LIBRARIES}
+ )
+
+-gtest_discover_tests(utils_test)
++gtest_discover_tests(utils_test DISCOVERY_TIMEOUT 25)