Merge branch 'PHP-7.1'

This commit is contained in:
Nikita Popov 2017-02-12 00:20:15 +01:00
commit 852c4a872f

View File

@ -836,7 +836,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);
}
@ -972,7 +972,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);