mirror of
https://github.com/php/php-src.git
synced 2024-09-24 19:37:26 +00:00
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
* 'PHP-5.5' of git.php.net:php-src: count($test_files) already be checked above : if ($test_cnt)
This commit is contained in:
commit
dfa5ca2b8d
@ -802,14 +802,12 @@ HELP;
|
||||
fclose($failed_tests_file);
|
||||
}
|
||||
|
||||
if (count($test_files) || count($test_results)) {
|
||||
compute_summary();
|
||||
if ($html_output) {
|
||||
fwrite($html_file, "<hr/>\n" . get_summary(false, true));
|
||||
}
|
||||
echo "=====================================================================";
|
||||
echo get_summary(false, false);
|
||||
compute_summary();
|
||||
if ($html_output) {
|
||||
fwrite($html_file, "<hr/>\n" . get_summary(false, true));
|
||||
}
|
||||
echo "=====================================================================";
|
||||
echo get_summary(false, false);
|
||||
|
||||
if ($html_output) {
|
||||
fclose($html_file);
|
||||
@ -821,7 +819,7 @@ HELP;
|
||||
|
||||
junit_save_xml();
|
||||
|
||||
if (getenv('REPORT_EXIT_STATUS') == 1 and preg_match('/ FAILED(?: |$)/', implode(' ', $test_results))) {
|
||||
if (getenv('REPORT_EXIT_STATUS') == 1 and $sum_results['FAILED']) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user