| OLD | NEW |
| 1 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved. | 1 # Copyright (C) 2013 Adobe Systems Incorporated. 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 | 4 # modification, are permitted provided that the following conditions |
| 5 # are met: | 5 # are met: |
| 6 # | 6 # |
| 7 # 1. Redistributions of source code must retain the above | 7 # 1. Redistributions of source code must retain the above |
| 8 # copyright notice, this list of conditions and the following | 8 # copyright notice, this list of conditions and the following |
| 9 # disclaimer. | 9 # disclaimer. |
| 10 # 2. Redistributions in binary form must reproduce the above | 10 # 2. Redistributions in binary form must reproduce the above |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 289 'reftests': reftests, 'jstests': jstests, 'total_tests': tot
al_tests}) | 289 'reftests': reftests, 'jstests': jstests, 'total_tests': tot
al_tests}) |
| 290 | 290 |
| 291 def find_paths_to_skip(self): | 291 def find_paths_to_skip(self): |
| 292 if self.options.ignore_expectations: | 292 if self.options.ignore_expectations: |
| 293 return set() | 293 return set() |
| 294 | 294 |
| 295 paths_to_skip = set() | 295 paths_to_skip = set() |
| 296 port = self.host.port_factory.get() | 296 port = self.host.port_factory.get() |
| 297 w3c_import_expectations_path = self.webkit_finder.path_from_webkit_base(
'LayoutTests', 'W3CImportExpectations') | 297 w3c_import_expectations_path = self.webkit_finder.path_from_webkit_base(
'LayoutTests', 'W3CImportExpectations') |
| 298 w3c_import_expectations = self.filesystem.read_text_file(w3c_import_expe
ctations_path) | 298 w3c_import_expectations = self.filesystem.read_text_file(w3c_import_expe
ctations_path) |
| 299 parser = TestExpectationParser(port, full_test_list=(), is_lint_mode=Fal
se) | 299 parser = TestExpectationParser(port, all_tests=(), is_lint_mode=False) |
| 300 expectation_lines = parser.parse(w3c_import_expectations_path, w3c_impor
t_expectations) | 300 expectation_lines = parser.parse(w3c_import_expectations_path, w3c_impor
t_expectations) |
| 301 for line in expectation_lines: | 301 for line in expectation_lines: |
| 302 if 'SKIP' in line.expectations: | 302 if 'SKIP' in line.expectations: |
| 303 if line.specifiers: | 303 if line.specifiers: |
| 304 _log.warning("W3CImportExpectations:%s should not have any s
pecifiers" % line.line_numbers) | 304 _log.warning("W3CImportExpectations:%s should not have any s
pecifiers" % line.line_numbers) |
| 305 continue | 305 continue |
| 306 paths_to_skip.add(line.name) | 306 paths_to_skip.add(line.name) |
| 307 return paths_to_skip | 307 return paths_to_skip |
| 308 | 308 |
| 309 def import_tests(self): | 309 def import_tests(self): |
| (...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 407 """ Creates a destination directory that mirrors that of the source dire
ctory """ | 407 """ Creates a destination directory that mirrors that of the source dire
ctory """ |
| 408 | 408 |
| 409 new_subpath = self.dir_to_import[len(self.top_of_repo):] | 409 new_subpath = self.dir_to_import[len(self.top_of_repo):] |
| 410 | 410 |
| 411 destination_directory = os.path.join(self.destination_directory, new_sub
path) | 411 destination_directory = os.path.join(self.destination_directory, new_sub
path) |
| 412 | 412 |
| 413 if not os.path.exists(destination_directory): | 413 if not os.path.exists(destination_directory): |
| 414 os.makedirs(destination_directory) | 414 os.makedirs(destination_directory) |
| 415 | 415 |
| 416 _log.info('Tests will be imported into: %s', destination_directory) | 416 _log.info('Tests will be imported into: %s', destination_directory) |
| OLD | NEW |