dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Emily 2024-09-08 02:12:21 +01:00 committed by GitHub
commit 92fab67bb6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/libraries/edencommon/default.nix
View File

@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
sha256 = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg="; 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 ]; nativeBuildInputs = [ cmake ];
cmakeFlags = lib.optionals stdenv.isDarwin [ cmakeFlags = lib.optionals stdenv.isDarwin [

20
pkgs/development/libraries/edencommon/increase-test-discovery-timeout.patch Normal file
View File

@ -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)