Diff
Modified: trunk/LayoutTests/ChangeLog (148995 => 148996)
--- trunk/LayoutTests/ChangeLog 2013-04-23 21:56:59 UTC (rev 148995)
+++ trunk/LayoutTests/ChangeLog 2013-04-23 21:58:28 UTC (rev 148996)
@@ -1,3 +1,16 @@
+2013-04-23 Jessie Berlin <[email protected]>
+
+ NRWT: confusing warning about a line being in a Skipped file when it is really just listed
+ in _missing_symbol_to_skipped_tests in base.py
+ https://bugs.webkit.org/show_bug.cgi?id=108884
+
+ Reviewed by Tim Horton.
+
+ Explicitly skip the mhtml tests on the Mac and Win ports.
+
+ * platform/mac/TestExpectations:
+ * platform/win/TestExpectations:
+
2013-04-23 Dirk Schulze <[email protected]>
Pick up color and mat values in custom shaders
Modified: trunk/LayoutTests/platform/mac/TestExpectations (148995 => 148996)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-04-23 21:56:59 UTC (rev 148995)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-04-23 21:58:28 UTC (rev 148996)
@@ -1157,6 +1157,9 @@
webkit.org/b/99945 fast/css3-text/css3-text-justify [ Failure ]
webkit.org/b/112755 fast/css3-text/css3-text-indent [ Failure ImageOnlyFailure ]
+# MHTML is not yet enabled
+mhtml [ Skip ]
+
# Our slow tests, in alphabetical order.
webkit.org/b/57672 http/tests/local/fileapi/send-sliced-dragged-file.html [ Failure Pass ]
Modified: trunk/LayoutTests/platform/win/TestExpectations (148995 => 148996)
--- trunk/LayoutTests/platform/win/TestExpectations 2013-04-23 21:56:59 UTC (rev 148995)
+++ trunk/LayoutTests/platform/win/TestExpectations 2013-04-23 21:58:28 UTC (rev 148996)
@@ -2430,6 +2430,9 @@
css3/supports-cssom.html
css3/supports-dom-api.html
+# MHTML is not yet enabled
+mhtml [ Skip ]
+
# https://bugs.webkit.org/show_bug.cgi?id=98169
http/tests/inspector/stacktraces
Modified: trunk/Tools/ChangeLog (148995 => 148996)
--- trunk/Tools/ChangeLog 2013-04-23 21:56:59 UTC (rev 148995)
+++ trunk/Tools/ChangeLog 2013-04-23 21:58:28 UTC (rev 148996)
@@ -1,3 +1,19 @@
+2013-04-23 Jessie Berlin <[email protected]>
+
+ NRWT: confusing warning about a line being in a Skipped file when it is really just listed
+ in _missing_symbol_to_skipped_tests in base.py
+ https://bugs.webkit.org/show_bug.cgi?id=108884
+
+ Reviewed by Tim Horton.
+
+ Remove symbol-based skipped list detection.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port._missing_feature_to_skipped_tests):
+ (Port._skipped_tests_for_unsupported_features):
+ * Scripts/webkitpy/port/port_testcase.py:
+ (PortTestCase.test_path_to_test_expectations_file):
+
2013-04-23 Benjamin Poulain <[email protected]>
Remove wxWebKit support from the Tools
Modified: trunk/Tools/Scripts/webkitpy/port/base.py (148995 => 148996)
--- trunk/Tools/Scripts/webkitpy/port/base.py 2013-04-23 21:56:59 UTC (rev 148995)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2013-04-23 21:58:28 UTC (rev 148996)
@@ -1491,23 +1491,6 @@
"3D Rendering": ["animations/3d", "transforms/3d"],
}
- # Ports which use compile-time feature detection should define this method and return
- # a dictionary mapping from symbol substrings to possibly disabled test directories.
- # When the symbol substrings are not matched, the directories will be skipped.
- # If ports don't ever enable certain features, then those directories can just be
- # in the Skipped list instead of compile-time-checked here.
- def _missing_symbol_to_skipped_tests(self):
- """Return the supported feature dictionary. The keys are symbol-substrings
- and the values are the lists of directories to skip if that symbol is missing."""
- return {
- "MathMLElement": ["mathml"],
- "GraphicsLayer": ["compositing"],
- "WebCoreHas3DRendering": ["animations/3d", "transforms/3d"],
- "WebGLShader": ["fast/canvas/webgl", "compositing/webgl", "http/tests/canvas/webgl", "webgl"],
- "MHTMLArchive": ["mhtml"],
- "CSSVariableValue": ["fast/css/variables", "inspector/styles/variables"],
- }
-
def _has_test_in_directories(self, directory_lists, test_list):
if not test_list:
return False
@@ -1530,15 +1513,6 @@
if supported_feature_list is not None:
return reduce(operator.add, [directories for feature, directories in self._missing_feature_to_skipped_tests().items() if feature not in supported_feature_list])
- # Only check the symbols of there are tests in the test_list that might get skipped.
- # This is a performance optimization to avoid the calling nm.
- # Runtime feature detection not supported, fallback to static dectection:
- # Disable any tests for symbols missing from the executable or libraries.
- if self._has_test_in_directories(self._missing_symbol_to_skipped_tests().values(), test_list):
- symbols_string = self._symbols_string()
- if symbols_string is not None:
- return reduce(operator.add, [directories for symbol_substring, directories in self._missing_symbol_to_skipped_tests().items() if symbol_substring not in symbols_string], [])
-
return []
def _wk2_port_name(self):
Modified: trunk/Tools/Scripts/webkitpy/port/port_testcase.py (148995 => 148996)
--- trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2013-04-23 21:56:59 UTC (rev 148995)
+++ trunk/Tools/Scripts/webkitpy/port/port_testcase.py 2013-04-23 21:58:28 UTC (rev 148996)
@@ -451,34 +451,6 @@
port._options = MockOptions(webkit_test_runner=False)
self.assertEqual(port.path_to_test_expectations_file(), '/mock-checkout/LayoutTests/platform/testwebkitport/TestExpectations')
- def test_skipped_directories_for_symbols(self):
- # This first test confirms that the commonly found symbols result in the expected skipped directories.
- symbols_string = " ".join(["GraphicsLayer", "WebCoreHas3DRendering", "isXHTMLMPDocument", "fooSymbol"])
- expected_directories = set([
- "mathml", # Requires MathMLElement
- "fast/canvas/webgl", # Requires WebGLShader
- "compositing/webgl", # Requires WebGLShader
- "http/tests/canvas/webgl", # Requires WebGLShader
- "webgl", # Requires WebGLShader
- "mhtml", # Requires MHTMLArchive
- "fast/css/variables", # Requires CSS Variables
- "inspector/styles/variables", # Requires CSS Variables
- ])
-
- result_directories = set(TestWebKitPort(symbols_string=symbols_string)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html']))
- self.assertEqual(result_directories, expected_directories)
-
- # Test that the nm string parsing actually works:
- symbols_string = """
-000000000124f498 s __ZZN7WebCore13GraphicsLayer12replaceChildEPS0_S1_E19__PRETTY_FUNCTION__
-000000000124f500 s __ZZN7WebCore13GraphicsLayer13addChildAboveEPS0_S1_E19__PRETTY_FUNCTION__
-000000000124f670 s __ZZN7WebCore13GraphicsLayer13addChildBelowEPS0_S1_E19__PRETTY_FUNCTION__
-"""
- # Note 'compositing' is not in the list of skipped directories (hence the parsing of GraphicsLayer worked):
- expected_directories = set(['mathml', 'transforms/3d', 'compositing/webgl', 'fast/canvas/webgl', 'animations/3d', 'webgl', 'mhtml', 'http/tests/canvas/webgl', 'fast/css/variables', 'inspector/styles/variables'])
- result_directories = set(TestWebKitPort(symbols_string=symbols_string)._skipped_tests_for_unsupported_features(test_list=['mathml/foo.html']))
- self.assertEqual(result_directories, expected_directories)
-
def test_skipped_directories_for_features(self):
supported_features = ["Accelerated Compositing", "Foo Feature"]
expected_directories = set(["animations/3d", "transforms/3d"])
