| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 3 # Use of this source code is governed by a BSD-style license that can be | 3 # Use of this source code is governed by a BSD-style license that can be |
| 4 # found in the LICENSE file. | 4 # found in the LICENSE file. |
| 5 | 5 |
| 6 """ Compare the generated GM images to the baselines """ | 6 """ Compare the generated GM images to the baselines """ |
| 7 | 7 |
| 8 from utils import shell_utils | 8 from utils import shell_utils |
| 9 from build_step import BuildStep, BuildStepWarning | 9 from build_step import BuildStep, BuildStepWarning |
| 10 import sys | 10 import sys |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 '--failonresult', 'Unknown', | 21 '--failonresult', 'Unknown', |
| 22 '--failonstatus', 'CouldNotDecode,CouldNotRead', 'any', | 22 '--failonstatus', 'CouldNotDecode,CouldNotRead', 'any', |
| 23 '--failonstatus', 'any', 'CouldNotDecode,CouldNotRead', | 23 '--failonstatus', 'any', 'CouldNotDecode,CouldNotRead', |
| 24 self._gm_expected_dir, | 24 self._gm_expected_dir, |
| 25 self._gm_actual_dir, | 25 self._gm_actual_dir, |
| 26 ] | 26 ] |
| 27 | 27 |
| 28 # Temporary list of builders who are allowed to fail this step without the | 28 # Temporary list of builders who are allowed to fail this step without the |
| 29 # bot turning red. | 29 # bot turning red. |
| 30 may_fail_with_warning = [ | 30 may_fail_with_warning = [ |
| 31 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_32', | 31 'Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug', |
| 32 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Debug_32_Trybot', | 32 'Test-Ubuntu12-ShuttleA-ATI5770-x86-Debug-Trybot', |
| 33 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_32', | 33 'Test-Ubuntu12-ShuttleA-ATI5770-x86-Release', |
| 34 'Skia_Shuttle_Ubuntu12_ATI5770_Float_Release_32_Trybot', | 34 'Test-Ubuntu12-ShuttleA-ATI5770-x86-Release-Trybot', |
| 35 'Skia_Shuttle_Win7_Intel_Float_Debug_64', | 35 'Test-Win7-ShuttleA-HD2000-x86_64-Debug', |
| 36 'Skia_Shuttle_Win7_Intel_Float_Debug_64_Trybot', | 36 'Test-Win7-ShuttleA-HD2000-x86_64-Debug-Trybot', |
| 37 'Skia_Shuttle_Win7_Intel_Float_Release_64', | 37 'Test-Win7-ShuttleA-HD2000-x86_64-Release', |
| 38 'Skia_Shuttle_Win7_Intel_Float_Release_64_Trybot', | 38 'Test-Win7-ShuttleA-HD2000-x86_64-Release-Trybot', |
| 39 'Skia_Mac_Float_Debug_64', | 39 'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug', |
| 40 'Skia_Mac_Float_Debug_64_Trybot', | 40 'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Debug-Trybot', |
| 41 'Skia_Mac_Float_Release_64', | 41 'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release', |
| 42 'Skia_Mac_Float_Release_64_Trybot', | 42 'Test-Mac10.6-MacMini4.1-GeForce320M-x86_64-Release-Trybot', |
| 43 'Skia_MacMiniLion_Float_Debug_64', | 43 'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug', |
| 44 'Skia_MacMiniLion_Float_Debug_64_Trybot', | 44 'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Debug-Trybot', |
| 45 'Skia_MacMiniLion_Float_Release_64', | 45 'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release', |
| 46 'Skia_MacMiniLion_Float_Release_64_Trybot', | 46 'Test-Mac10.7-MacMini4.1-GeForce320M-x86_64-Release-Trybot', |
| 47 ] | 47 ] |
| 48 try: | 48 try: |
| 49 shell_utils.Bash(cmd) | 49 shell_utils.Bash(cmd) |
| 50 except Exception as e: | 50 except Exception as e: |
| 51 if self._builder_name in may_fail_with_warning: | 51 if self._builder_name in may_fail_with_warning: |
| 52 raise BuildStepWarning(e) | 52 raise BuildStepWarning(e) |
| 53 else: | 53 else: |
| 54 raise | 54 raise |
| 55 | 55 |
| 56 | 56 |
| 57 if '__main__' == __name__: | 57 if '__main__' == __name__: |
| 58 sys.exit(BuildStep.RunBuildStep(CompareGMs)) | 58 sys.exit(BuildStep.RunBuildStep(CompareGMs)) |
| OLD | NEW |