count($test_files) already be checked above : if ($test_cnt)

thus we can use $sum_results instead of the preg_match
This commit is contained in:
Xinchen Hui 2012-11-25 16:18:20 +08:00
parent 11c946e594
commit 16efc77608

View File

@ -802,14 +802,12 @@ HELP;
fclose($failed_tests_file); fclose($failed_tests_file);
} }
if (count($test_files) || count($test_results)) { compute_summary();
compute_summary(); if ($html_output) {
if ($html_output) { fwrite($html_file, "<hr/>\n" . get_summary(false, true));
fwrite($html_file, "<hr/>\n" . get_summary(false, true));
}
echo "=====================================================================";
echo get_summary(false, false);
} }
echo "=====================================================================";
echo get_summary(false, false);
if ($html_output) { if ($html_output) {
fclose($html_file); fclose($html_file);
@ -821,7 +819,7 @@ HELP;
junit_save_xml(); 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); exit(1);
} }