diff options
| author | Alex Light <allight@google.com> | 2017-10-11 00:32:55 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-10-11 00:32:55 +0000 |
| commit | 804263c82e90aec73a90de61b9661500adb935cc (patch) | |
| tree | 88b720964878562aa1504dea9208da8c76cabc0c | |
| parent | 4b624b8d6dcbe1a84b9ac0be446f7c12eb609014 (diff) | |
| parent | 8634c09995e824316719a3acf60d04a529c8c412 (diff) | |
Merge "Include run-test command in script failure output." am: c53ade547d am: 076b0e35f9
am: 8634c09995
Change-Id: I9a4af8d773404383a46ed4c50bf563695d3521e3
| -rwxr-xr-x | test/testrunner/testrunner.py | 17 |
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': |