From 7a09daa9139d543129a56f50b74e152843579f3e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 9 Feb 2023 18:00:22 +0100 Subject: [PATCH] phpExtensions.opcache: remove flaky tests on darwin Some of the tests of ext-opcache are flaky on darwin. Issue is not obvious to me and I cannot troubleshoot this locally. --- pkgs/top-level/php-packages.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 827985cab7e5..1350b83c4998 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -84,7 +84,6 @@ lib.makeScope pkgs.newScope (self: with self; { , zendExtension ? false , doCheck ? true , extName ? name - , allowLocalNetworking ? false , ... }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { pname = "php-${name}"; @@ -104,7 +103,6 @@ lib.makeScope pkgs.newScope (self: with self; { ]; inherit configureFlags internalDeps buildInputs zendExtension doCheck; - __darwinAllowLocalNetworking = allowLocalNetworking; preConfigurePhases = [ "cdToExtensionRootPhase" @@ -413,8 +411,17 @@ lib.makeScope pkgs.newScope (self: with self; { valgrind.dev ]; zendExtension = true; + postPatch = lib.optionalString stdenv.isDarwin '' + # Tests are flaky on darwin + rm ext/opcache/tests/blacklist.phpt + rm ext/opcache/tests/bug66338.phpt + rm ext/opcache/tests/bug78106.phpt + rm ext/opcache/tests/issue0115.phpt + rm ext/opcache/tests/issue0149.phpt + rm ext/opcache/tests/revalidate_path_01.phpt + ''; # Tests launch the builtin webserver. - allowLocalNetworking = true; + __darwinAllowLocalNetworking = true; } { name = "openssl";