Merge branch '2.3' into 2.7

nicolas-grekas · nicolas-grekas · commit 90dd3fb6b983 · 2015-12-23T16:34:07.000+01:00
* 2.3:
  [appveyor] Exit with failing status code
diff --git a/appveyor.yml b/appveyor.yml
@@ -55,9 +55,10 @@ install:
 
 test_script:
     - cd c:\projects\symfony
+    - Setlocal EnableDelayedExpansion
     - SET X=0
     - copy /Y c:\php\php.ini-min c:\php\php.ini
-    - php phpunit symfony --exclude-group benchmark,intl-data || SET X=1
+    - php phpunit symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
     - copy /Y c:\php\php.ini-max c:\php\php.ini
-    - php phpunit symfony --exclude-group benchmark,intl-data || SET X=1
+    - php phpunit symfony --exclude-group benchmark,intl-data || SET X=!errorlevel!
     - exit %X%
diff --git a/phpunit b/phpunit
@@ -162,7 +162,7 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) {
 
             // 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)) {
-                $exit = 1;
+                $exit = $procStatus;
                 echo "\033[41mKO\033[0m $component\n\n";
             } else {
                 echo "\033[32mOK\033[0m $component\n\n";
