8000 Merge branch '2.8' into 3.0 · symfony/symfony@db74a25 · GitHub
[go: up one dir, main page]
Skip to content

Commit db74a25

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '2.8' into 3.0
* 2.8: [appveyor] Ignore failures due to STATUS_ACCESS_VIOLATION errors
2 parents 6f6915f + afe4cbb commit db74a25

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

‎phpunit

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) {
160160
unlink($file);
161161
}
162162

163-
// Fail on any individual component failures but ignore STATUS_STACK_BUFFER_OVERRUN (-1073740791) on Windows when APCu is enabled
164-
if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !ini_get('apc.enable_cli') || -1073740791 !== $procStatus)) {
163+
// 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
164+
if ($procStatus && ('\\' !== DIRECTORY_SEPARATOR || !extension_loaded('apcu') || !ini_get('apc.enable_cli') || (-1073740791 !== $procStatus && -1073741819 !== $procStatus))) {
165165
$exit = $procStatus;
166166
echo "\033[41mKO\033[0m $component\n\n";
167167
} else {

‎src/Symfony/Component/Config/Tests/Resource/DirectoryResourceTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class DirectoryResourceTest extends \PHPUnit_Framework_TestCase
1919

2020
protected function setUp()
2121
{
22-
$this->directory = sys_get_temp_dir().'/symfonyDirectoryIterator';
22+
$this->directory = sys_get_temp_dir().DIRECTORY_SEPARATOR.'symfonyDirectoryIterator';
2323
if (!file_exists($this->directory)) {
2424
mkdir($this->directory);
2525
}

0 commit comments

Comments
 (0)
0