Changeset 89949 in webkit
- Timestamp:
- Jun 28, 2011 12:33:27 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r89944 r89949 1 2011-06-28 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Tony Chang. 4 5 new-run-webkit-tests should not run mthml tests when MHTML support is disabled 6 https://bugs.webkit.org/show_bug.cgi?id=63549 7 8 This way mhtml tests won't show up as "missing" results on all non-chromium platforms. 9 I happen to go looking for what code was deciding that .mht was a supported 10 extension, found test_files.py and then removed some redundant doc-strings and 11 if branching. 12 13 * Scripts/webkitpy/layout_tests/port/test_files.py: 14 * Scripts/webkitpy/layout_tests/port/webkit.py: 15 * Scripts/webkitpy/layout_tests/port/webkit_unittest.py: 16 1 17 2011-06-28 Roland Steiner <rolandsteiner@chromium.org> 2 18 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/test_files.py
r88913 r89949 100 100 101 101 def _has_supported_extension(filesystem, filename): 102 """Return true if filename is one of the file extensions we want to run a 103 test on.""" 102 """Return true if filename is one of the file extensions we want to run a test on.""" 104 103 extension = filesystem.splitext(filename)[1] 105 104 return extension in _supported_file_extensions … … 107 106 108 107 def is_reference_html_file(filename): 109 """Return true if the filename points to a reference HTML file.""" 110 if (filename.endswith('-expected.html') or 111 filename.endswith('-expected-mismatch.html')): 112 return True 113 return False 108 return filename.endswith('-expected.html') or filename.endswith('-expected-mismatch.html') 114 109 115 110 116 111 def _is_test_file(filesystem, dirname, filename): 117 """Return true if the filename points to a test file.""" 118 return (_has_supported_extension(filesystem, filename) and 119 not is_reference_html_file(filename)) 112 return _has_supported_extension(filesystem, filename) and not is_reference_html_file(filename) -
trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py
r89868 r89949 252 252 "parseWCSSInputProperty": ["fast/wcss"], 253 253 "isXHTMLMPDocument": ["fast/xhtmlmp"], 254 "MHTMLArchive": ["mhtml"], 254 255 } 255 256 return directories_for_symbol -
trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py
r89868 r89949 87 87 def test_skipped_directories_for_symbols(self): 88 88 supported_symbols = ["GraphicsLayer", "WebCoreHas3DRendering", "isXHTMLMPDocument", "fooSymbol"] 89 expected_directories = set(["mathml", "fast/canvas/webgl", "compositing/webgl", "http/tests/canvas/webgl", "fast/wcss" ])89 expected_directories = set(["mathml", "fast/canvas/webgl", "compositing/webgl", "http/tests/canvas/webgl", "fast/wcss", "mhtml"]) 90 90 result_directories = set(TestWebKitPort(supported_symbols, None)._skipped_tests_for_unsupported_features()) 91 91 self.assertEqual(result_directories, expected_directories)
Note: See TracChangeset
for help on using the changeset viewer.