| OLD | NEW |
| 1 # Copyright (C) 2010 Google Inc. All rights reserved. | 1 # Copyright (C) 2010 Google Inc. All rights reserved. |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
| 5 # met: | 5 # met: |
| 6 # | 6 # |
| 7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
| 8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
| 9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
| 10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
| (...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 863 | 863 |
| 864 Args: | 864 Args: |
| 865 baseline_path: the actual path to use for baseline, not the path to | 865 baseline_path: the actual path to use for baseline, not the path to |
| 866 the test. This function is used to update either generic or | 866 the test. This function is used to update either generic or |
| 867 platform-specific baselines, but we can't infer which here. | 867 platform-specific baselines, but we can't infer which here. |
| 868 data: contents of the baseline. | 868 data: contents of the baseline. |
| 869 """ | 869 """ |
| 870 self._filesystem.write_binary_file(baseline_path, data) | 870 self._filesystem.write_binary_file(baseline_path, data) |
| 871 | 871 |
| 872 # TODO(qyearsley): Update callers to create a finder and call it instead | 872 # TODO(qyearsley): Update callers to create a finder and call it instead |
| 873 # of these next three routines (which should be protected). | 873 # of these next two routines (which should be protected). |
| 874 def webkit_base(self): | |
| 875 return self._webkit_finder.webkit_base() | |
| 876 | |
| 877 def path_from_chromium_base(self, *comps): | 874 def path_from_chromium_base(self, *comps): |
| 878 return self._webkit_finder.path_from_chromium_base(*comps) | 875 return self._webkit_finder.path_from_chromium_base(*comps) |
| 879 | 876 |
| 877 def perf_tests_dir(self): |
| 878 return self._webkit_finder.perf_tests_dir() |
| 879 |
| 880 def layout_tests_dir(self): | 880 def layout_tests_dir(self): |
| 881 custom_layout_tests_dir = self.get_option('layout_tests_directory') | 881 custom_layout_tests_dir = self.get_option('layout_tests_directory') |
| 882 if custom_layout_tests_dir: | 882 if custom_layout_tests_dir: |
| 883 return custom_layout_tests_dir | 883 return custom_layout_tests_dir |
| 884 return self._webkit_finder.layout_tests_dir() | 884 return self._webkit_finder.layout_tests_dir() |
| 885 | 885 |
| 886 def perf_tests_dir(self): | |
| 887 return self._webkit_finder.perf_tests_dir() | |
| 888 | |
| 889 def skipped_layout_tests(self, _): | 886 def skipped_layout_tests(self, _): |
| 890 # TODO(qyearsley): Remove this method. | 887 # TODO(qyearsley): Remove this method. |
| 891 return set() | 888 return set() |
| 892 | 889 |
| 893 def skips_test(self, test, generic_expectations, full_expectations): | 890 def skips_test(self, test, generic_expectations, full_expectations): |
| 894 """Checks whether the given test is skipped for this port. | 891 """Checks whether the given test is skipped for this port. |
| 895 | 892 |
| 896 This should return True if the test is skipped because the port | 893 This should return True if the test is skipped because the port |
| 897 runs smoke tests only, or because the test is skipped in a file like | 894 runs smoke tests only, or because the test is skipped in a file like |
| 898 NeverFixTests (but not TestExpectations). | 895 NeverFixTests (but not TestExpectations). |
| (...skipping 730 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1629 | 1626 |
| 1630 def __init__(self, base, args, reference_args=None): | 1627 def __init__(self, base, args, reference_args=None): |
| 1631 self.name = base | 1628 self.name = base |
| 1632 self.base = base | 1629 self.base = base |
| 1633 self.args = args | 1630 self.args = args |
| 1634 self.reference_args = args if reference_args is None else reference_args | 1631 self.reference_args = args if reference_args is None else reference_args |
| 1635 self.tests = set() | 1632 self.tests = set() |
| 1636 | 1633 |
| 1637 def __repr__(self): | 1634 def __repr__(self): |
| 1638 return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base,
self.args, self.reference_args) | 1635 return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base,
self.args, self.reference_args) |
| OLD | NEW |