| OLD | NEW |
| 1 #!/usr/bin/python | 1 #!/usr/bin/python |
| 2 | 2 |
| 3 """ | 3 """ |
| 4 Copyright 2013 Google Inc. | 4 Copyright 2013 Google Inc. |
| 5 | 5 |
| 6 Use of this source code is governed by a BSD-style license that can be | 6 Use of this source code is governed by a BSD-style license that can be |
| 7 found in the LICENSE file. | 7 found in the LICENSE file. |
| 8 | 8 |
| 9 Repackage expected/actual GM results as needed by our HTML rebaseline viewer. | 9 Repackage expected/actual GM results as needed by our HTML rebaseline viewer. |
| 10 """ | 10 """ |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 https://code.google.com/p/skia/issues/detail?id=2036 ('rebaseline_server | 188 https://code.google.com/p/skia/issues/detail?id=2036 ('rebaseline_server |
| 189 produces error when trying to add baselines for ASAN/TSAN builders') | 189 produces error when trying to add baselines for ASAN/TSAN builders') |
| 190 | 190 |
| 191 Args: | 191 Args: |
| 192 builder: name of this builder, as a string | 192 builder: name of this builder, as a string |
| 193 | 193 |
| 194 Returns: | 194 Returns: |
| 195 True if we should ignore expectations and actuals for this builder. | 195 True if we should ignore expectations and actuals for this builder. |
| 196 """ | 196 """ |
| 197 return (builder.endswith('-Trybot') or | 197 return (builder.endswith('-Trybot') or |
| 198 ('Logan' in builder) or |
| 198 ('Valgrind' in builder) or | 199 ('Valgrind' in builder) or |
| 199 ('TSAN' in builder) or | 200 ('TSAN' in builder) or |
| 200 ('ASAN' in builder)) | 201 ('ASAN' in builder)) |
| 201 | 202 |
| 202 @staticmethod | 203 @staticmethod |
| 203 def _read_dicts_from_root(root, pattern='*.json'): | 204 def _read_dicts_from_root(root, pattern='*.json'): |
| 204 """Read all JSON dictionaries within a directory tree. | 205 """Read all JSON dictionaries within a directory tree. |
| 205 | 206 |
| 206 Args: | 207 Args: |
| 207 root: path to root of directory tree | 208 root: path to root of directory tree |
| (...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 533 help='Directory within which to download images and generate diffs') | 534 help='Directory within which to download images and generate diffs') |
| 534 args = parser.parse_args() | 535 args = parser.parse_args() |
| 535 results = Results(actuals_root=args.actuals, | 536 results = Results(actuals_root=args.actuals, |
| 536 expected_root=args.expectations, | 537 expected_root=args.expectations, |
| 537 generated_images_root=args.workdir) | 538 generated_images_root=args.workdir) |
| 538 gm_json.WriteToFile(results.get_results_of_type(RESULTS_ALL), args.outfile) | 539 gm_json.WriteToFile(results.get_results_of_type(RESULTS_ALL), args.outfile) |
| 539 | 540 |
| 540 | 541 |
| 541 if __name__ == '__main__': | 542 if __name__ == '__main__': |
| 542 main() | 543 main() |
| OLD | NEW |