Modified: trunk/LayoutTests/ChangeLog (125239 => 125240)
--- trunk/LayoutTests/ChangeLog 2012-08-10 02:26:35 UTC (rev 125239)
+++ trunk/LayoutTests/ChangeLog 2012-08-10 02:28:05 UTC (rev 125240)
@@ -1,3 +1,15 @@
+2012-08-09 Xianzhu Wang <[email protected]>
+
+ [Chromium-Android] Skip layout tests directories that are not applicable
+ https://bugs.webkit.org/show_bug.cgi?id=93670
+
+ Reviewed by Dirk Pranke.
+
+ Removed 'WONTFIX ANDROID SKIP' lines for whole directories added in r125094.
+ Use ChromiumAndroidPort.skipped_layout_tests() instead.
+
+ * platform/chromium/TestExpectations:
+
2012-08-09 Erik Arvidsson <[email protected]>
HTMLElement.classList cannot remove classnames with uppercase characters
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (125239 => 125240)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-10 02:26:35 UTC (rev 125239)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-08-10 02:28:05 UTC (rev 125240)
@@ -172,27 +172,7 @@
WONTFIX SKIP : platform/qt/fast/forms = PASS
WONTFIX MAC WIN : platform/chromium-linux = TEXT IMAGE IMAGE+TEXT
WONTFIX SKIP LINUX MAC : platform/win = PASS
-WONTFIX SKIP ANDROID : platform/gtk = PASS
-WONTFIX SKIP ANDROID : platform/mac = PASS
-WONTFIX SKIP ANDROID : platform/mac-wk2 = PASS
-WONTFIX SKIP ANDROID : platform/qt = PASS
-WONTFIX SKIP ANDROID : platform/win = PASS
-// Android doesn't support plugins.
-WONTFIX SKIP ANDROID : plugins = PASS
-WONTFIX SKIP ANDROID : http/tests/plugins = PASS
-WONTFIX SKIP ANDROID : compositing/plugins = PASS
-
-// Android doesn't have inspector front-end.
-WONTFIX SKIP ANDROID : inspector = PASS
-WONTFIX SKIP ANDROID : http/tests/inspector = PASS
-WONTFIX SKIP ANDROID : http/tests/inspector-enabled = PASS
-WONTFIX SKIP ANDROID : platform/chromium/inspector = PASS
-
-// Android always run the following test with hardware GPU enabled (using the platform/chromium/virtual version).
-WONTFIX SKIP ANDROID : canvas/philip = PASS
-WONTFIX SKIP ANDROID : fast/canvas = PASS
-
// These tests are for -apple- and -khtml- prefixes, which we don't support
WONTFIX SKIP : inspector/styles/vendor-prefixes.html = TIMEOUT
WONTFIX SKIP : fast/css/apple-prefix.html = PASS
Modified: trunk/Tools/ChangeLog (125239 => 125240)
--- trunk/Tools/ChangeLog 2012-08-10 02:26:35 UTC (rev 125239)
+++ trunk/Tools/ChangeLog 2012-08-10 02:28:05 UTC (rev 125240)
@@ -1,3 +1,17 @@
+2012-08-09 Xianzhu Wang <[email protected]>
+
+ [Chromium-Android] Skip layout tests directories that are not applicable
+ https://bugs.webkit.org/show_bug.cgi?id=93670
+
+ Reviewed by Dirk Pranke.
+
+ Added back ChromiumAndroidPort.skipped_layout_tests to skip some whole directories.
+ The method is more convenient to skip whole directories than SKIP in TestExpectations
+ because its higher priority. Will still use TestExpectations to skip individual tests.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+ (ChromiumAndroidPort.skipped_layout_tests):
+
2012-08-09 Elliott Sprehn <[email protected]>
Add myself to the Contributor list.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py (125239 => 125240)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-08-10 02:26:35 UTC (rev 125239)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-08-10 02:28:05 UTC (rev 125240)
@@ -221,6 +221,44 @@
def clean_up_test_run(self):
super(ChromiumAndroidPort, self).stop_http_server()
+ def skipped_layout_tests(self, test_list):
+ # This method is more convenient to skip whole directories than SKIP in TestExpectations
+ # because its higher priority.
+ # Still use TestExpectations to skip individual tests.
+ return self._real_tests([
+ # Only run these tests as virtual gpu tests.
+ 'canvas/philip',
+ 'fast/canvas',
+
+ # Skip tests of other platforms to save time.
+ 'platform/gtk',
+ 'platform/mac',
+ 'platform/mac-wk2',
+ 'platform/qt',
+ 'platform/win',
+
+ # Features not supported.
+ 'compositing/plugins',
+ 'plugins',
+ 'http/tests/plugins',
+ 'platform/chromium/compositing/plugins',
+ 'platform/chromium/plugins',
+
+ 'http/tests/inspector',
+ 'http/tests/inspector-enabled',
+ 'inspector',
+ 'platform/chromium/inspector',
+
+ 'accessibility',
+ 'platform/chromium/accessibility',
+
+ 'fast/dom/MediaStream',
+ 'fast/mediastream',
+ 'fast/notifications',
+ 'fast/speech',
+ 'webaudio',
+ ])
+
def create_driver(self, worker_number, no_timeout=False):
# We don't want the default DriverProxy which is not compatible with our driver.
# See comments in ChromiumAndroidDriver.start().
