]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorStanislav Malyshev <stas@php.net>
Sun, 18 Mar 2018 22:07:53 +0000 (15:07 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 18 Mar 2018 22:07:53 +0000 (15:07 -0700)
* PHP-7.2:
  Set tests exit status by default.

1  2 
run-tests.php

diff --cc run-tests.php
index 18685961d49352c303cf2b02303e6cf1dee7f990,85e59e54bc20cb5642db20b2a76c267a99821548..7ab872119a412726fae1769bd49ffa3d6e8c09f2
mode 100644,100755..100644
@@@ -860,7 -876,9 +860,9 @@@ HELP
  
                junit_save_xml();
  
-               if (getenv('REPORT_EXIT_STATUS') == 1 && ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
+               if (getenv('REPORT_EXIT_STATUS') !== '0' &&
+                       getenv('REPORT_EXIT_STATUS') !== 'no' &&
 -                      ($sum_results['FAILED'] || $sum_results['BORKED'])) {
++                      ($sum_results['FAILED'] || $sum_results['BORKED'] || $sum_results['LEAKED'])) {
                        exit(1);
                }