Tools/ChangeLog

 12011-06-28 Eric Seidel <eric@webkit.org>
 2
 3 Reviewed by NOBODY (OOPS!).
 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
1172011-06-28 Adam Roben <aroben@apple.com>
218
319 Roll out r89924 and r89925

Tools/Scripts/webkitpy/layout_tests/port/test_files.py

@@def normalized_find(filesystem, paths):
9999
100100
101101def _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."""
104103 extension = filesystem.splitext(filename)[1]
105104 return extension in _supported_file_extensions
106105
107106
108107def 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')
114109
115110
116111def _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)

Tools/Scripts/webkitpy/layout_tests/port/webkit.py

@@class WebKitPort(base.Port):
251251 "WebGLShader": ["fast/canvas/webgl", "compositing/webgl", "http/tests/canvas/webgl"],
252252 "parseWCSSInputProperty": ["fast/wcss"],
253253 "isXHTMLMPDocument": ["fast/xhtmlmp"],
 254 "MHTMLArchive": ["mhtml"],
254255 }
255256 return directories_for_symbol
256257

Tools/Scripts/webkitpy/layout_tests/port/webkit_unittest.py

@@class WebKitPortTest(port_testcase.PortTestCase):
8686
8787 def test_skipped_directories_for_symbols(self):
8888 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"])
9090 result_directories = set(TestWebKitPort(supported_symbols, None)._skipped_tests_for_unsupported_features())
9191 self.assertEqual(result_directories, expected_directories)
9292