| 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 667 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 678 | 678 |
| 679 suites = self.virtual_test_suites() | 679 suites = self.virtual_test_suites() |
| 680 if paths: | 680 if paths: |
| 681 tests.extend(self._virtual_tests_matching_paths(paths, suites)) | 681 tests.extend(self._virtual_tests_matching_paths(paths, suites)) |
| 682 else: | 682 else: |
| 683 tests.extend(self._all_virtual_tests(suites)) | 683 tests.extend(self._all_virtual_tests(suites)) |
| 684 return tests | 684 return tests |
| 685 | 685 |
| 686 def real_tests(self, paths): | 686 def real_tests(self, paths): |
| 687 # When collecting test cases, skip these directories. | 687 # When collecting test cases, skip these directories. |
| 688 skipped_directories = set(['.svn', '_svn', 'platform', 'resources', 'sup
port', 'script-tests', 'reference', 'reftest']) | 688 skipped_directories = set(['platform', 'resources', 'support', 'script-t
ests', 'reference', 'reftest']) |
| 689 files = find_files.find(self._filesystem, self.layout_tests_dir(), paths
, | 689 files = find_files.find(self._filesystem, self.layout_tests_dir(), paths
, |
| 690 skipped_directories, functools.partial(Port.is_t
est_file, self), self.test_key) | 690 skipped_directories, functools.partial(Port.is_t
est_file, self), self.test_key) |
| 691 return self._convert_wpt_file_paths_to_url_paths([self.relative_test_fil
ename(f) for f in files]) | 691 return self._convert_wpt_file_paths_to_url_paths([self.relative_test_fil
ename(f) for f in files]) |
| 692 | 692 |
| 693 @staticmethod | 693 @staticmethod |
| 694 # If any changes are made here be sure to update the isUsedInReftest method
in old-run-webkit-tests as well. | 694 # If any changes are made here be sure to update the isUsedInReftest method
in old-run-webkit-tests as well. |
| 695 def is_reference_html_file(filesystem, dirname, filename): | 695 def is_reference_html_file(filesystem, dirname, filename): |
| 696 if filename.startswith('ref-') or filename.startswith('notref-'): | 696 if filename.startswith('ref-') or filename.startswith('notref-'): |
| 697 return True | 697 return True |
| 698 filename_without_ext, _ = filesystem.splitext(filename) | 698 filename_without_ext, _ = filesystem.splitext(filename) |
| (...skipping 919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1618 | 1618 |
| 1619 def __init__(self, base, args, reference_args=None): | 1619 def __init__(self, base, args, reference_args=None): |
| 1620 self.name = base | 1620 self.name = base |
| 1621 self.base = base | 1621 self.base = base |
| 1622 self.args = args | 1622 self.args = args |
| 1623 self.reference_args = args if reference_args is None else reference_args | 1623 self.reference_args = args if reference_args is None else reference_args |
| 1624 self.tests = set() | 1624 self.tests = set() |
| 1625 | 1625 |
| 1626 def __repr__(self): | 1626 def __repr__(self): |
| 1627 return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base,
self.args, self.reference_args) | 1627 return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base,
self.args, self.reference_args) |
| OLD | NEW |