Title: [89949] trunk/Tools
- Revision
- 89949
- Author
- [email protected]
- Date
- 2011-06-28 12:33:27 -0700 (Tue, 28 Jun 2011)
Log Message
2011-06-28 Eric Seidel <[email protected]>
Reviewed by Tony Chang.
new-run-webkit-tests should not run mthml tests when MHTML support is disabled
https://bugs.webkit.org/show_bug.cgi?id=63549
This way mhtml tests won't show up as "missing" results on all non-chromium platforms.
I happen to go looking for what code was deciding that .mht was a supported
extension, found test_files.py and then removed some redundant doc-strings and
if branching.
* Scripts/webkitpy/layout_tests/port/test_files.py:
* Scripts/webkitpy/layout_tests/port/webkit.py:
* Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (89948 => 89949)
--- trunk/Tools/ChangeLog 2011-06-28 19:19:33 UTC (rev 89948)
+++ trunk/Tools/ChangeLog 2011-06-28 19:33:27 UTC (rev 89949)
@@ -1,3 +1,19 @@
+2011-06-28 Eric Seidel <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ new-run-webkit-tests should not run mthml tests when MHTML support is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=63549
+
+ This way mhtml tests won't show up as "missing" results on all non-chromium platforms.
+ I happen to go looking for what code was deciding that .mht was a supported
+ extension, found test_files.py and then removed some redundant doc-strings and
+ if branching.
+
+ * Scripts/webkitpy/layout_tests/port/test_files.py:
+ * Scripts/webkitpy/layout_tests/port/webkit.py:
+ * Scripts/webkitpy/layout_tests/port/webkit_unittest.py:
+
2011-06-28 Roland Steiner <[email protected]>
Reviewed by Tony Chang.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test_files.py (89948 => 89949)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test_files.py 2011-06-28 19:19:33 UTC (rev 89948)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test_files.py 2011-06-28 19:33:27 UTC (rev 89949)
@@ -99,21 +99,14 @@
def _has_supported_extension(filesystem, filename):
- """Return true if filename is one of the file extensions we want to run a
- test on."""
+ """Return true if filename is one of the file extensions we want to run a test on."""
extension = filesystem.splitext(filename)[1]
return extension in _supported_file_extensions
def is_reference_html_file(filename):
- """Return true if the filename points to a reference HTML file."""
- if (filename.endswith('-expected.html') or
- filename.endswith('-expected-mismatch.html')):
- return True
- return False
+ return filename.endswith('-expected.html') or filename.endswith('-expected-mismatch.html')
def _is_test_file(filesystem, dirname, filename):
- """Return true if the filename points to a test file."""
- return (_has_supported_extension(filesystem, filename) and
- not is_reference_html_file(filename))
+ return _has_supported_extension(filesystem, filename) and not is_reference_html_file(filename)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (89948 => 89949)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-06-28 19:19:33 UTC (rev 89948)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py 2011-06-28 19:33:27 UTC (rev 89949)
@@ -251,6 +251,7 @@
"WebGLShader": ["fast/canvas/webgl", "compositing/webgl", "http/tests/canvas/webgl"],
"parseWCSSInputProperty": ["fast/wcss"],
"isXHTMLMPDocument": ["fast/xhtmlmp"],
+ "MHTMLArchive": ["mhtml"],
}
return directories_for_symbol
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py (89948 => 89949)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-06-28 19:19:33 UTC (rev 89948)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py 2011-06-28 19:33:27 UTC (rev 89949)
@@ -86,7 +86,7 @@
def test_skipped_directories_for_symbols(self):
supported_symbols = ["GraphicsLayer", "WebCoreHas3DRendering", "isXHTMLMPDocument", "fooSymbol"]
- expected_directories = set(["mathml", "fast/canvas/webgl", "compositing/webgl", "http/tests/canvas/webgl", "fast/wcss"])
+ expected_directories = set(["mathml", "fast/canvas/webgl", "compositing/webgl", "http/tests/canvas/webgl", "fast/wcss", "mhtml"])
result_directories = set(TestWebKitPort(supported_symbols, None)._skipped_tests_for_unsupported_features())
self.assertEqual(result_directories, expected_directories)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
