diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-12 00:20:06 +0100 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-12 00:20:06 +0100 |
commit | 479d7c3f4d472510841d71fc86136e1a968e3e86 (patch) | |
tree | 07ccd25c4053ec98b94112c8e7de0e1b2536baab /run-tests.php | |
parent | 9fb2812b56a69290f1454c8b20be55679c68c3cb (diff) | |
parent | 981c58705ada3f645232afa490ac334bc27306ae (diff) | |
download | php-git-479d7c3f4d472510841d71fc86136e1a968e3e86.tar.gz |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'run-tests.php')
-rwxr-xr-x | run-tests.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/run-tests.php b/run-tests.php index 77b95b25d3..1991b56a08 100755 --- a/run-tests.php +++ b/run-tests.php @@ -841,7 +841,7 @@ HELP; junit_save_xml(); - if (getenv('REPORT_EXIT_STATUS') == 1 and $sum_results['FAILED']) { + if (getenv('REPORT_EXIT_STATUS') == 1 && ($sum_results['FAILED'] || $sum_results['BORKED'])) { exit(1); } @@ -977,7 +977,7 @@ save_or_mail_results(); junit_save_xml(); -if (getenv('REPORT_EXIT_STATUS') == 1 and $sum_results['FAILED']) { +if (getenv('REPORT_EXIT_STATUS') == 1 && ($sum_results['FAILED'] || $sum_results['BORKED'])) { exit(1); } exit(0); |