| 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 958 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 969 if not self._results_directory: | 969 if not self._results_directory: |
| 970 option_val = self.get_option('results_directory') or self.default_re
sults_directory() | 970 option_val = self.get_option('results_directory') or self.default_re
sults_directory() |
| 971 self._results_directory = self._filesystem.abspath(option_val) | 971 self._results_directory = self._filesystem.abspath(option_val) |
| 972 return self._results_directory | 972 return self._results_directory |
| 973 | 973 |
| 974 def perf_results_directory(self): | 974 def perf_results_directory(self): |
| 975 return self._build_path() | 975 return self._build_path() |
| 976 | 976 |
| 977 def default_results_directory(self): | 977 def default_results_directory(self): |
| 978 """Absolute path to the default place to store the test results.""" | 978 """Absolute path to the default place to store the test results.""" |
| 979 try: | 979 return self._build_path('layout-test-results') |
| 980 return self.path_from_chromium_base('webkit', self.get_option('confi
guration'), 'layout-test-results') | |
| 981 except AssertionError: | |
| 982 return self._build_path('layout-test-results') | |
| 983 | 980 |
| 984 def setup_test_run(self): | 981 def setup_test_run(self): |
| 985 """Perform port-specific work at the beginning of a test run.""" | 982 """Perform port-specific work at the beginning of a test run.""" |
| 986 # Delete the disk cache if any to ensure a clean test run. | 983 # Delete the disk cache if any to ensure a clean test run. |
| 987 dump_render_tree_binary_path = self._path_to_driver() | 984 dump_render_tree_binary_path = self._path_to_driver() |
| 988 cachedir = self._filesystem.dirname(dump_render_tree_binary_path) | 985 cachedir = self._filesystem.dirname(dump_render_tree_binary_path) |
| 989 cachedir = self._filesystem.join(cachedir, "cache") | 986 cachedir = self._filesystem.join(cachedir, "cache") |
| 990 if self._filesystem.exists(cachedir): | 987 if self._filesystem.exists(cachedir): |
| 991 self._filesystem.rmtree(cachedir) | 988 self._filesystem.rmtree(cachedir) |
| 992 | 989 |
| (...skipping 769 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1762 | 1759 |
| 1763 class PhysicalTestSuite(object): | 1760 class PhysicalTestSuite(object): |
| 1764 def __init__(self, base, args): | 1761 def __init__(self, base, args): |
| 1765 self.name = base | 1762 self.name = base |
| 1766 self.base = base | 1763 self.base = base |
| 1767 self.args = args | 1764 self.args = args |
| 1768 self.tests = set() | 1765 self.tests = set() |
| 1769 | 1766 |
| 1770 def __repr__(self): | 1767 def __repr__(self): |
| 1771 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self
.args) | 1768 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self
.args) |
| OLD | NEW |