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 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
223 return True | 223 return True |
224 | 224 |
225 def additional_drt_flag(self): | 225 def additional_drt_flag(self): |
226 driver_name = self.driver_name() | 226 driver_name = self.driver_name() |
227 if driver_name == self.CONTENT_SHELL_NAME: | 227 if driver_name == self.CONTENT_SHELL_NAME: |
228 return ['--dump-render-tree'] | 228 return ['--dump-render-tree'] |
229 if driver_name == self.MOJO_SHELL_NAME: | 229 if driver_name == self.MOJO_SHELL_NAME: |
230 return [ | 230 return [ |
231 '--args-for=mojo:native_viewport_service --use-headless-config - -use-osmesa', | 231 '--args-for=mojo:native_viewport_service --use-headless-config - -use-osmesa', |
232 '--args-for=mojo:sky_viewer --testing', | 232 '--args-for=mojo:sky_viewer --testing', |
233 '--content-handlers=text/sky,mojo:sky_viewer', | 233 '--content-handlers=text/sky,mojo:sky_viewer,text/plain,mojo:sky _viewer', |
eseidel
2015/05/27 19:37:08
Should .dart be served as text/plain?
abarth-chromium
2015/05/27 20:13:50
Probably not. I just made this code match what sk
| |
234 '--url-mappings=mojo:window_manager=mojo:sky_tester,mojo:surface s_service=mojo:fake_surfaces_service', | 234 '--url-mappings=mojo:window_manager=mojo:sky_tester,mojo:surface s_service=mojo:fake_surfaces_service', |
235 'mojo:window_manager', | 235 'mojo:window_manager', |
236 ] | 236 ] |
237 return [] | 237 return [] |
238 | 238 |
239 def supports_per_test_timeout(self): | 239 def supports_per_test_timeout(self): |
240 return False | 240 return False |
241 | 241 |
242 def default_pixel_tests(self): | 242 def default_pixel_tests(self): |
243 return False | 243 return False |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
718 tests.extend(self._virtual_tests(paths, self.populated_virtual_test_suit es())) | 718 tests.extend(self._virtual_tests(paths, self.populated_virtual_test_suit es())) |
719 return tests | 719 return tests |
720 | 720 |
721 def _real_tests(self, paths): | 721 def _real_tests(self, paths): |
722 # When collecting test cases, skip these directories | 722 # When collecting test cases, skip these directories |
723 skipped_directories = set(['.svn', '_svn', 'platform', 'resources', 'sup port', 'script-tests', 'reference', 'reftest', 'conf']) | 723 skipped_directories = set(['.svn', '_svn', 'platform', 'resources', 'sup port', 'script-tests', 'reference', 'reftest', 'conf']) |
724 files = find_files.find(self._filesystem, self.layout_tests_dir(), paths , skipped_directories, Port.is_test_file, self.test_key) | 724 files = find_files.find(self._filesystem, self.layout_tests_dir(), paths , skipped_directories, Port.is_test_file, self.test_key) |
725 return [self.relative_test_filename(f) for f in files] | 725 return [self.relative_test_filename(f) for f in files] |
726 | 726 |
727 # When collecting test cases, we include any file with these extensions. | 727 # When collecting test cases, we include any file with these extensions. |
728 _supported_file_extensions = set(['.sky']) | 728 _supported_file_extensions = set(['.sky', '.dart']) |
729 | 729 |
730 @staticmethod | 730 @staticmethod |
731 # If any changes are made here be sure to update the isUsedInReftest method in old-run-webkit-tests as well. | 731 # If any changes are made here be sure to update the isUsedInReftest method in old-run-webkit-tests as well. |
732 def is_reference_html_file(filesystem, dirname, filename): | 732 def is_reference_html_file(filesystem, dirname, filename): |
733 if filename.startswith('ref-') or filename.startswith('notref-'): | 733 if filename.startswith('ref-') or filename.startswith('notref-'): |
734 return True | 734 return True |
735 filename_wihout_ext, unused = filesystem.splitext(filename) | 735 filename_wihout_ext, unused = filesystem.splitext(filename) |
736 for suffix in ['-expected', '-expected-mismatch', '-ref', '-notref']: | 736 for suffix in ['-expected', '-expected-mismatch', '-ref', '-notref']: |
737 if filename_wihout_ext.endswith(suffix): | 737 if filename_wihout_ext.endswith(suffix): |
738 return True | 738 return True |
(...skipping 1038 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1777 | 1777 |
1778 class PhysicalTestSuite(object): | 1778 class PhysicalTestSuite(object): |
1779 def __init__(self, base, args): | 1779 def __init__(self, base, args): |
1780 self.name = base | 1780 self.name = base |
1781 self.base = base | 1781 self.base = base |
1782 self.args = args | 1782 self.args = args |
1783 self.tests = set() | 1783 self.tests = set() |
1784 | 1784 |
1785 def __repr__(self): | 1785 def __repr__(self): |
1786 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self .args) | 1786 return "PhysicalTestSuite('%s', '%s', %s)" % (self.name, self.base, self .args) |
OLD | NEW |