Merge branch '3.0'
* 3.0: [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors Conflicts: src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php
This commit is contained in:
commit
4dde7a5e7e
4
phpunit
4
phpunit
@ -160,8 +160,8 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) {
|
||||
unlink($file);
|
||||
}
|
||||
|
||||
// Fail on any individual component failures but ignore STATUS_STACK_BUFFER_OVERRUN (-1073740791) on Windows when APCu is enabled
|
||||
if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !ini_get('apc.enable_cli') || -1073740791 !== $procStatus)) {
|
||||
// Fail on any individual component failures but ignore STATUS_STACK_BUFFER_OVERRUN (-1073740791/0xC0000409) and STATUS_ACCESS_VIOLATION (-1073741819/0xC0000005) on Windows when APCu is enabled
|
||||
if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !ini_get('apc.enable_cli') || (-1073740791 !== $procStatus && -1073741819 !== $procStatus))) {
|
||||
$exit = $procStatus;
|
||||
echo "\033[41mKO\033[0m $component\n\n";
|
||||
} else {
|
||||
|
@ -19,7 +19,7 @@ class DirectoryResourceTest extends \PHPUnit_Framework_TestCase
|
||||
|
||||
protected function setUp()
|
||||
{
|
||||
$this->directory = realpath(sys_get_temp_dir()).'/symfonyDirectoryIterator';
|
||||
$this->directory = sys_get_temp_dir().DIRECTORY_SEPARATOR.'symfonyDirectoryIterator';
|
||||
if (!file_exists($this->directory)) {
|
||||
mkdir($this->directory);
|
||||
}
|
||||
|
Reference in New Issue
Block a user