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 879 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
890 return self._webkit_finder.path_to_script(script_name) | 890 return self._webkit_finder.path_to_script(script_name) |
891 | 891 |
892 def layout_tests_dir(self): | 892 def layout_tests_dir(self): |
893 return self._webkit_finder.layout_tests_dir() | 893 return self._webkit_finder.layout_tests_dir() |
894 | 894 |
895 def perf_tests_dir(self): | 895 def perf_tests_dir(self): |
896 return self._webkit_finder.perf_tests_dir() | 896 return self._webkit_finder.perf_tests_dir() |
897 | 897 |
898 def skipped_layout_tests(self, test_list): | 898 def skipped_layout_tests(self, test_list): |
899 """Returns tests skipped outside of the TestExpectations files.""" | 899 """Returns tests skipped outside of the TestExpectations files.""" |
900 return set(self._skipped_tests_for_unsupported_features(test_list)) | 900 tests = set(self._skipped_tests_for_unsupported_features(test_list)) |
| 901 |
| 902 # We explicitly skip any tests in LayoutTests/w3c if need be to avoid ru
nning any tests |
| 903 # left over from the old DEPS-pulled repos. |
| 904 # We also will warn at the end of the test run if these directories stil
l exist. |
| 905 # |
| 906 # TODO(dpranke): Remove this check after 1/1/2015 and let people deal wi
th the warnings. |
| 907 # Remove the check in controllers/manager.py as well. |
| 908 if self._filesystem.isdir(self._filesystem.join(self.layout_tests_dir(),
'w3c')): |
| 909 tests.add('w3c') |
| 910 |
| 911 return tests |
901 | 912 |
902 def _tests_from_skipped_file_contents(self, skipped_file_contents): | 913 def _tests_from_skipped_file_contents(self, skipped_file_contents): |
903 tests_to_skip = [] | 914 tests_to_skip = [] |
904 for line in skipped_file_contents.split('\n'): | 915 for line in skipped_file_contents.split('\n'): |
905 line = line.strip() | 916 line = line.strip() |
906 line = line.rstrip('/') # Best to normalize directory names to not
include the trailing slash. | 917 line = line.rstrip('/') # Best to normalize directory names to not
include the trailing slash. |
907 if line.startswith('#') or not len(line): | 918 if line.startswith('#') or not len(line): |
908 continue | 919 continue |
909 tests_to_skip.append(line) | 920 tests_to_skip.append(line) |
910 return tests_to_skip | 921 return tests_to_skip |
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1223 'mac_layout_rel', | 1234 'mac_layout_rel', |
1224 'win_layout_rel', | 1235 'win_layout_rel', |
1225 ]) | 1236 ]) |
1226 | 1237 |
1227 def warn_if_bug_missing_in_test_expectations(self): | 1238 def warn_if_bug_missing_in_test_expectations(self): |
1228 return True | 1239 return True |
1229 | 1240 |
1230 def _port_specific_expectations_files(self): | 1241 def _port_specific_expectations_files(self): |
1231 paths = [] | 1242 paths = [] |
1232 paths.append(self.path_from_chromium_base('skia', 'skia_test_expectation
s.txt')) | 1243 paths.append(self.path_from_chromium_base('skia', 'skia_test_expectation
s.txt')) |
1233 paths.append(self.path_from_chromium_base('webkit', 'tools', 'layout_tes
ts', 'test_expectations_w3c.txt')) | |
1234 paths.append(self._filesystem.join(self.layout_tests_dir(), 'NeverFixTes
ts')) | 1244 paths.append(self._filesystem.join(self.layout_tests_dir(), 'NeverFixTes
ts')) |
1235 paths.append(self._filesystem.join(self.layout_tests_dir(), 'StaleTestEx
pectations')) | 1245 paths.append(self._filesystem.join(self.layout_tests_dir(), 'StaleTestEx
pectations')) |
1236 paths.append(self._filesystem.join(self.layout_tests_dir(), 'SlowTests')
) | 1246 paths.append(self._filesystem.join(self.layout_tests_dir(), 'SlowTests')
) |
1237 paths.append(self._filesystem.join(self.layout_tests_dir(), 'FlakyTests'
)) | 1247 paths.append(self._filesystem.join(self.layout_tests_dir(), 'FlakyTests'
)) |
1238 | 1248 |
1239 builder_name = self.get_option('builder_name', 'DUMMY_BUILDER_NAME') | 1249 builder_name = self.get_option('builder_name', 'DUMMY_BUILDER_NAME') |
1240 if builder_name == 'DUMMY_BUILDER_NAME' or '(deps)' in builder_name or b
uilder_name in self.try_builder_names: | 1250 if builder_name == 'DUMMY_BUILDER_NAME' or '(deps)' in builder_name or b
uilder_name in self.try_builder_names: |
1241 paths.append(self.path_from_chromium_base('webkit', 'tools', 'layout
_tests', 'test_expectations.txt')) | 1251 paths.append(self.path_from_chromium_base('webkit', 'tools', 'layout
_tests', 'test_expectations.txt')) |
1242 return paths | 1252 return paths |
1243 | 1253 |
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1708 | 1718 |
1709 class PhysicalTestSuite(object): | 1719 class PhysicalTestSuite(object): |
1710 def __init__(self, base, args): | 1720 def __init__(self, base, args): |
1711 self.name = base | 1721 self.name = base |
1712 self.base = base | 1722 self.base = base |
1713 self.args = args | 1723 self.args = args |
1714 self.tests = set() | 1724 self.tests = set() |
1715 | 1725 |
1716 def __repr__(self): | 1726 def __repr__(self): |
1717 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self
.args) | 1727 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self
.args) |
OLD | NEW |