| 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 """ |
| 11 | 11 |
| 12 # System-level imports | 12 # System-level imports |
| 13 import argparse | 13 import argparse |
| 14 import fnmatch | 14 import fnmatch |
| 15 import logging | 15 import logging |
| 16 import os | 16 import os |
| 17 import time | 17 import time |
| 18 | 18 |
| 19 # Must fix up PYTHONPATH before importing from within Skia | 19 # Must fix up PYTHONPATH before importing from within Skia |
| 20 # pylint: disable=W0611 | 20 import fix_pythonpath # pylint: disable=W0611 |
| 21 import fix_pythonpath | |
| 22 # pylint: enable=W0611 | |
| 23 | 21 |
| 24 # Imports from within Skia | 22 # Imports from within Skia |
| 25 from pyutils import url_utils | 23 from py.utils import url_utils |
| 26 import column | 24 import column |
| 27 import gm_json | 25 import gm_json |
| 28 import imagediffdb | 26 import imagediffdb |
| 29 import imagepair | 27 import imagepair |
| 30 import imagepairset | 28 import imagepairset |
| 31 import results | 29 import results |
| 32 | 30 |
| 33 EXPECTATION_FIELDS_PASSED_THRU_VERBATIM = [ | 31 EXPECTATION_FIELDS_PASSED_THRU_VERBATIM = [ |
| 34 results.KEY__EXPECTATIONS__BUGS, | 32 results.KEY__EXPECTATIONS__BUGS, |
| 35 results.KEY__EXPECTATIONS__IGNOREFAILURE, | 33 results.KEY__EXPECTATIONS__IGNOREFAILURE, |
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 406 actuals_root=args.actuals, | 404 actuals_root=args.actuals, |
| 407 expected_root=args.expectations, | 405 expected_root=args.expectations, |
| 408 ignore_failures_file=args.ignore_failures_file) | 406 ignore_failures_file=args.ignore_failures_file) |
| 409 gm_json.WriteToFile( | 407 gm_json.WriteToFile( |
| 410 results_obj.get_packaged_results_of_type(results_type=args.results), | 408 results_obj.get_packaged_results_of_type(results_type=args.results), |
| 411 args.outfile) | 409 args.outfile) |
| 412 | 410 |
| 413 | 411 |
| 414 if __name__ == '__main__': | 412 if __name__ == '__main__': |
| 415 main() | 413 main() |
| OLD | NEW |