Merge pull request #215539 from LeSuisse/php-opcache-flaky-test-darwin
phpExtensions.opcache: remove flaky test on darwin
This commit is contained in:
commit
12aa304e68
@ -91,7 +91,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}";
|
||||
@ -111,7 +110,6 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||
];
|
||||
|
||||
inherit configureFlags internalDeps buildInputs zendExtension doCheck;
|
||||
__darwinAllowLocalNetworking = allowLocalNetworking;
|
||||
|
||||
preConfigurePhases = [
|
||||
"cdToExtensionRootPhase"
|
||||
@ -420,8 +418,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";
|
||||
|
Loading…
Reference in New Issue
Block a user