From b518ae76cc2f8c20fc5e766ed81fa07e1616c97e Mon Sep 17 00:00:00 2001 From: "dpranke@chromium.org" Date: Thu, 10 Oct 2013 18:47:14 +0000 Subject: [PATCH] fix swapped passes, failures in parsing layout test results Also, make the step fail if the fulL_results.json file is missing, and make the step warn if we get unexpected flakes or passes. TBR=ilevy@chromium.org BUG=293920 Review URL: https://codereview.chromium.org/26841003 git-svn-id: http://src.chromium.org/svn/trunk/src/build@227967 4ff67af0-8c30-449e-8e8b-ad334ec8d88c --- android/buildbot/bb_device_steps.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/android/buildbot/bb_device_steps.py b/android/buildbot/bb_device_steps.py index dabe4b5f0..b0460c3f9 100755 --- a/android/buildbot/bb_device_steps.py +++ b/android/buildbot/bb_device_steps.py @@ -270,7 +270,7 @@ def RunWebkitLayoutTests(options): 'full_results.json') if os.path.exists(full_results_path): full_results = json.load(open(full_results_path)) - unexpected_failures, unexpected_flakes, unexpected_passes = ( + unexpected_passes, unexpected_flakes, unexpected_failures = ( _ParseLayoutTestResults(full_results)) if unexpected_failures: _PrintDashboardLink('failed', unexpected_failures, @@ -281,7 +281,12 @@ def RunWebkitLayoutTests(options): if unexpected_flakes: _PrintDashboardLink('unexpected flakes', unexpected_flakes, max_tests=10) + + if exit_code == 0 and (unexpected_passes or unexpected_flakes): + # If exit_code != 0, RunCmd() will have already printed an error. + bb_annotations.PrintWarning() else: + bb_annotations.PrintError() bb_annotations.PrintMsg('?? (results missing)') if options.factory_properties.get('archive_webkit_results', False):