From: Stanislav Malyshev <stas@php.net>
Date: Mon, 19 Mar 2018 08:18:54 +0000 (-0700)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~169
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=371076d6f080ba4c05109219a5618209523ee5d5;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Set tests exit status by defaul - also in other instance.
---

371076d6f080ba4c05109219a5618209523ee5d5
diff --cc run-tests.php
index 7ab872119a,f4720f5b76..e66eeba34e
mode 100644,100755..100644
--- a/run-tests.php
+++ b/run-tests.php
@@@ -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);