From: Stanislav Malyshev <stas@php.net>
Date: Sun, 18 Mar 2018 22:07:53 +0000 (-0700)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~170
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6aec16c0d9b04edc6de2ae3b357b80668dcbb690;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Set tests exit status by default.
---

6aec16c0d9b04edc6de2ae3b357b80668dcbb690
diff --cc run-tests.php
index 18685961d4,85e59e54bc..7ab872119a
mode 100644,100755..100644
--- a/run-tests.php
+++ b/run-tests.php
@@@ -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);
  		}