Commit 5a4c730c authored by catch's avatar catch

Issue #2707467 by alexpott: Improve run-tests.sh phpunit error reporting when something goes wrong

(cherry picked from commit bf40f0968b25fa25a60df53875d3eb0f44f293c0)
parent 6592dc61
......@@ -181,6 +181,8 @@ function simpletest_run_tests($test_list) {
function simpletest_run_phpunit_tests($test_id, array $unescaped_test_classnames, &$status = NULL) {
$phpunit_file = simpletest_phpunit_xml_filepath($test_id);
simpletest_phpunit_run_command($unescaped_test_classnames, $phpunit_file, $status);
$rows = simpletest_phpunit_xml_to_rows($test_id, $phpunit_file);
// A $status of 0 = passed test, 1 = failed test, > 1 indicates segfault
// timeout, or other type of failure.
if ($status > 1) {
......@@ -197,9 +199,6 @@ function simpletest_run_phpunit_tests($test_id, array $unescaped_test_classnames
'file' => $phpunit_file,
];
}
else {
$rows = simpletest_phpunit_xml_to_rows($test_id, $phpunit_file);
}
return $rows;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment