cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #215539 from LeSuisse/php-opcache-flaky-test-darwin

Browse source 
phpExtensions.opcache: remove flaky test on darwin
This commit is contained in:
Elis Hirwing 2023-02-10 11:27:38 +01:00 committed by GitHub
commit 12aa304e68
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/top-level/php-packages.nix
View file

@ -91,7 +91,6 @@ lib.makeScope pkgs.newScope (self: with self; {
, zendExtension ? false , zendExtension ? false
, doCheck ? true , doCheck ? true
, extName ? name , extName ? name
, allowLocalNetworking ? false
, ... , ...
}@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // { }@args: stdenv.mkDerivation ((builtins.removeAttrs args [ "name" ]) // {
pname = "php-${name}"; pname = "php-${name}";
@ -111,7 +110,6 @@ lib.makeScope pkgs.newScope (self: with self; {
]; ];
inherit configureFlags internalDeps buildInputs zendExtension doCheck; inherit configureFlags internalDeps buildInputs zendExtension doCheck;
__darwinAllowLocalNetworking = allowLocalNetworking;
preConfigurePhases = [ preConfigurePhases = [
"cdToExtensionRootPhase" "cdToExtensionRootPhase"
@ -420,8 +418,17 @@ lib.makeScope pkgs.newScope (self: with self; {
valgrind.dev valgrind.dev
]; ];
zendExtension = true; 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. # Tests launch the builtin webserver.
allowLocalNetworking = true; __darwinAllowLocalNetworking = true;
} }
{ {
name = "openssl"; name = "openssl";