summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtest/testrunner/testrunner.py17
1 files changed, 12 insertions, 5 deletions
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index b5929cb588..ca29d0a484 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -481,7 +481,7 @@ def run_test(command, test, test_variant, test_name):
if test_passed:
print_test_info(test_name, 'PASS')
else:
- failed_tests.append((test_name, script_output))
+ failed_tests.append((test_name, str(command) + "\n" + script_output))
if not env.ART_TEST_KEEP_GOING:
stop_testrunner = True
print_test_info(test_name, 'FAIL', ('%s\n%s') % (
@@ -536,10 +536,17 @@ def print_test_info(test_name, result, failed_test_info=""):
total_test_count)
if result == 'FAIL' or result == 'TIMEOUT':
- info += ('%s %s %s\n') % (
- progress_info,
- test_name,
- COLOR_ERROR + result + COLOR_NORMAL)
+ if not verbose:
+ info += ('%s %s %s\n') % (
+ progress_info,
+ test_name,
+ COLOR_ERROR + result + COLOR_NORMAL)
+ else:
+ info += ('%s %s %s\n%s\n') % (
+ progress_info,
+ test_name,
+ COLOR_ERROR + result + COLOR_NORMAL,
+ failed_test_info)
else:
result_text = ''
if result == 'PASS':