]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2'
authorStanislav Malyshev <stas@php.net>
Mon, 19 Mar 2018 08:18:54 +0000 (01:18 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 19 Mar 2018 08:20:04 +0000 (01:20 -0700)
* PHP-7.2:
  Set tests exit status by defaul - also in other instance.

1  2 
run-tests.php

diff --cc run-tests.php
index 7ab872119a412726fae1769bd49ffa3d6e8c09f2,f4720f5b76a811a5f7ee1b19ce15e4c68ecf7307..e66eeba34e382a9873beab5cb4dc08468a724840
mode 100644,100755..100644
@@@ -999,7 -1017,10 +999,9 @@@ if ($html_output) 
  save_or_mail_results();
  
  junit_save_xml();
- if (getenv('REPORT_EXIT_STATUS') == 1 && ($sum_results['FAILED'] || $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['LEAKED'])) {
        exit(1);
  }
  exit(0);