Commit 912531f6 authored by Emily's avatar Emily
Browse files

edencommon: patch to increase test discovery timeout 

For some reason, this build is incredibly flaky on `x86_64-darwin`,
possibly because of the recent `staging-next` merge, failing with a
test discovery timeout error both on Hydra and locally. The default
discovery timeout is apparently 5 seconds, so let’s try giving it
5 times as long and see if that helps.
parent 2495ff4b

pkgs/development/libraries/edencommon/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -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 [

pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch

0 → 100644
+20 −0
Original line number Diff line number Diff line 
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)