Diff
Modified: trunk/LayoutTests/ChangeLog (127381 => 127382)
--- trunk/LayoutTests/ChangeLog 2012-09-01 19:46:16 UTC (rev 127381)
+++ trunk/LayoutTests/ChangeLog 2012-09-01 20:29:32 UTC (rev 127382)
@@ -1,3 +1,16 @@
+2012-09-01 Xianzhu Wang <[email protected]>
+
+ [Chromium-Android] Remove hard-coded skipped directories in chromium_android.py
+ https://bugs.webkit.org/show_bug.cgi?id=95605
+
+ Reviewed by Dirk Pranke.
+
+ Moved the skipping rules for ANDROID into platform/chromium-android/TestExpectations.
+
+ * platform/chromium/TestExpectations:
+ * platform/chromium/test_expectations_android.txt: Removed.
+ * platform/chromium-android/TestExpectations: Added.
+
2012-09-01 Ned Holbrook <[email protected]>
Regression(r126763): Heap-use-after-free in WebCore::nextBreakablePosition
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (127381 => 127382)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-09-01 19:46:16 UTC (rev 127381)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-09-01 20:29:32 UTC (rev 127382)
@@ -894,61 +894,8 @@
// Test fails because it's trying to load a plugin we don't have. We probably don't need to fix this.
WONTFIX : platform/gtk/plugins/invalidate-rect-with-null-npp-argument.html = TEXT
-// This test is only for GTK which is not applicable to Android.
-WONTFIX ANDROID SKIP : platform/chromium-linux/fast/text/chromium-linux-fontconfig-renderstyle.html = TEXT
+// Skipping rules for ANDROID are in platform/chromium-android/TestExpectations.
-// The following features are not enabled on Android.
-// Some bigger whole directories (plugins, webgl, inspector, etc.) are skipped in chromium_android.py.
-BUGCR145338 WONTFIX ANDROID SKIP : fast/forms/time-multiple-fields = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/forms/color = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/forms/datalist = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/forms/date = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/mediastream = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/notifications = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/speech = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : platform/chromium/fast/forms/color = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : platform/chromium/media/video-capture-preview.html = PASS // Uses mediastream
-BUGCR145338 WONTFIX ANDROID SKIP : webaudio = PASS
-
-// Skip tests depending on plugins that is not available on Android.
-// The whole directories of plugins, http/tests/plugins, etc. are skipped in chromium_android.py.
-BUGCR145338 WONTFIX ANDROID SKIP : fast/dom/Window/Plug-ins.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/frames/sandboxed-iframe-about-blank.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/frames/sandboxed-iframe-navigation-allowed.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/frames/sandboxed-iframe-plugins.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/replaced/invalid-object-with-fallback.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : fast/replaced/object-with-embed-url-param.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-mismatched-data.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-mismatched-url.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-url.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-allowed.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-02.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/object-src-none-allowed.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/object-src-none-blocked.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/object-src-url-allowed.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/contentSecurityPolicy/object-src-url-blocked.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : platform/chromium/permissionclient/plugin-permission.html = PASS
-BUGCR145338 WONTFIX ANDROID SKIP : userscripts/user-script-plugin-document.html = PASS
-
-// Causes server error. Not feasible to fix because this is a behavior of Apache server.
-BUGWK95378 WONTFIX ANDROID SKIP : fast/encoding/percent-escaping.html = PASS
-
-// Tests depending on Bengali, Tamil, Danda fonts
-BUGWK95378 WONTFIX ANDROID SKIP : fast/text/international/bold-bengali.html = PASS
-BUGWK95378 WONTFIX ANDROID SKIP : fast/text/international/complex-character-based-fallback.html = PASS
-
-// The test creates a temporary file via HTTP POST and access the file as a blob. This is unfeasible.
-BUGWK95378 WONTFIX ANDROID SKIP : http/tests/local/fileapi/send-sliced-dragged-file.html = PASS
-
-// The test depends on the same modified time returned from local file api and PHP. This is unfeasible.
-BUGWK95378 WONTFIX ANDROID SKIP : http/tests/local/fileapi/file-last-modified.html = PASS
-
-// Android font lacks some plane2 CJK glyphs to pass this test.
-BUGWK95378 WONTFIX ANDROID SKIP : fast/text/international/plane2.html = PASS
-
// -----------------------------------------------------------------
// TESTS TO FIX
// -----------------------------------------------------------------
Deleted: trunk/LayoutTests/platform/chromium/test_expectations_android.txt (127381 => 127382)
--- trunk/LayoutTests/platform/chromium/test_expectations_android.txt 2012-09-01 19:46:16 UTC (rev 127381)
+++ trunk/LayoutTests/platform/chromium/test_expectations_android.txt 2012-09-01 20:29:32 UTC (rev 127382)
@@ -1,6 +0,0 @@
-// This file should remain empty. It is used by the chromium-android port in
-// its downstream repository to manage test expecations downstream. When the
-// chromium-android port runs tests on build.webkit.org, test expectations
-// should be put in the Chromium TestExpectations file as normal rather than
-// here. We will delete this file once we finish upstreaming the
-// chromium-android port.
Added: trunk/LayoutTests/platform/chromium-android/TestExpectations (0 => 127382)
--- trunk/LayoutTests/platform/chromium-android/TestExpectations (rev 0)
+++ trunk/LayoutTests/platform/chromium-android/TestExpectations 2012-09-01 20:29:32 UTC (rev 127382)
@@ -0,0 +1,85 @@
+// This file should contain only the rules to skip tests about the features not supported
+// or not testable on Android.
+//
+// Other rules should be in TestExpectations.
+
+// Skip tests of other platforms to save time.
+WONTFIX SKIP : platform/gtk = PASS
+WONTFIX SKIP : platform/mac = PASS
+WONTFIX SKIP : platform/mac-wk2 = PASS
+WONTFIX SKIP : platform/qt = PASS
+WONTFIX SKIP : platform/win = PASS
+
+// Features not supported: http://crbug.com/145338.
+BUGCR145338 SKIP : compositing/plugins = PASS
+BUGCR145338 SKIP : plugins = PASS
+BUGCR145338 SKIP : http/tests/plugins = PASS
+BUGCR145338 SKIP : platform/chromium/compositing/plugins = PASS
+BUGCR145338 SKIP : platform/chromium/plugins = PASS
+
+BUGCR145338 SKIP : fast/dom/Window/Plug-ins.html = PASS
+BUGCR145338 SKIP : fast/frames/sandboxed-iframe-about-blank.html = PASS
+BUGCR145338 SKIP : fast/frames/sandboxed-iframe-navigation-allowed.html = PASS
+BUGCR145338 SKIP : fast/frames/sandboxed-iframe-plugins.html = PASS
+BUGCR145338 SKIP : fast/replaced/invalid-object-with-fallback.html = PASS
+BUGCR145338 SKIP : fast/replaced/object-with-embed-url-param.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-invalid.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-mismatched-data.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-mismatched-url.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-notype-url.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-nourl-allowed.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-01.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/1.1/plugintypes-url-02.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/object-src-none-allowed.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/object-src-none-blocked.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/object-src-url-allowed.html = PASS
+BUGCR145338 SKIP : http/tests/security/contentSecurityPolicy/object-src-url-blocked.html = PASS
+BUGCR145338 SKIP : http/tests/security/frameNavigation/xss-DENIED-plugin-navigation.html = PASS
+BUGCR145338 SKIP : platform/chromium/permissionclient/plugin-permission.html = PASS
+BUGCR145338 SKIP : userscripts/user-script-plugin-document.html = PASS
+
+BUGCR145338 SKIP : http/tests/inspector = PASS
+BUGCR145338 SKIP : http/tests/inspector-enabled = PASS
+BUGCR145338 SKIP : inspector = PASS
+BUGCR145338 SKIP : platform/chromium/inspector = PASS
+
+BUGCR145338 SKIP : accessibility = PASS
+BUGCR145338 SKIP : platform/chromium/accessibility = PASS
+
+BUGCR145338 SKIP : fast/forms/time-multiple-fields = PASS
+BUGCR145338 SKIP : fast/forms/color = PASS
+BUGCR145338 SKIP : fast/forms/datalist = PASS
+BUGCR145338 SKIP : fast/forms/date = PASS
+BUGCR145338 SKIP : fast/mediastream = PASS
+BUGCR145338 SKIP : fast/notifications = PASS
+BUGCR145338 SKIP : fast/speech = PASS
+BUGCR145338 SKIP : http/tests/notifications = PASS
+BUGCR145338 SKIP : platform/chromium/fast/forms/color = PASS
+BUGCR145338 SKIP : platform/chromium/media/video-capture-preview.html = PASS // Uses mediastream
+BUGCR145338 SKIP : webaudio = PASS
+
+// This test is only for GTK which is not applicable to Android.
+WONTFIX SKIP : platform/chromium-linux/fast/text/chromium-linux-fontconfig-renderstyle.html = TEXT
+
+// Skip webgl tests: http://crbug.com/135877.
+BUGCR135877 SKIP : compositing/webgl = PASS
+BUGCR135877 SKIP : fast/canvas/webgl = PASS
+BUGCR135877 SKIP : http/tests/canvas/webgl = PASS
+BUGCR135877 SKIP : platform/chromium/virtual/gpu/fast/canvas/webgl = PASS
+BUGCR135877 SKIP : platform/chromium/virtual/threaded/compositing/webgl = PASS
+
+// Causes server error. Not feasible to fix because this is a behavior of Apache server.
+BUGWK95378 WONTFIX SKIP : fast/encoding/percent-escaping.html = PASS
+
+// Tests depending on Bengali, Tamil, Danda fonts
+BUGWK95378 WONTFIX SKIP : fast/text/international/bold-bengali.html = PASS
+BUGWK95378 WONTFIX SKIP : fast/text/international/complex-character-based-fallback.html = PASS
+
+// The test creates a temporary file via HTTP POST and access the file as a blob. This is unfeasible.
+BUGWK95378 WONTFIX SKIP : http/tests/local/fileapi/send-sliced-dragged-file.html = PASS
+
+// The test depends on the same modified time returned from local file api and PHP. This is unfeasible.
+BUGWK95378 WONTFIX SKIP : http/tests/local/fileapi/file-last-modified.html = PASS
+
+// Android font lacks some plane2 CJK glyphs to pass this test.
+BUGWK95378 WONTFIX SKIP : fast/text/international/plane2.html = PASS
Modified: trunk/Tools/ChangeLog (127381 => 127382)
--- trunk/Tools/ChangeLog 2012-09-01 19:46:16 UTC (rev 127381)
+++ trunk/Tools/ChangeLog 2012-09-01 20:29:32 UTC (rev 127382)
@@ -1,3 +1,17 @@
+2012-09-01 Xianzhu Wang <[email protected]>
+
+ [Chromium-Android] Remove hard-coded skipped directories in chromium_android.py
+ https://bugs.webkit.org/show_bug.cgi?id=95605
+
+ Reviewed by Dirk Pranke.
+
+ Now skipping rules are put in LayoutTests/platform/chromium-android/TestExpectations.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+ (ChromiumAndroidPort.check_sys_deps):
+ (ChromiumAndroidPort.expectations_files):
+ (ChromiumAndroidPort.clean_up_test_run):
+
2012-09-01 Joanmarie Diggs <[email protected]>
[Gtk] Incorrect/unexpected characters in the text of certain accessibles
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py (127381 => 127382)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-09-01 19:46:16 UTC (rev 127381)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-09-01 20:29:32 UTC (rev 127382)
@@ -210,9 +210,11 @@
return False
return True
- # FIXME: Remove this function when chromium-android is fully upstream.
def expectations_files(self):
- android_expectations_file = self.path_from_webkit_base('LayoutTests', 'platform', 'chromium', 'test_expectations_android.txt')
+ # LayoutTests/platform/chromium-android/TestExpectations should contain only the rules to
+ # skip tests for the features not supported or not testable on Android.
+ # Other rules should be in LayoutTests/platform/chromium/TestExpectations.
+ android_expectations_file = self.path_from_webkit_base('LayoutTests', 'platform', 'chromium-android', 'TestExpectations')
return super(ChromiumAndroidPort, self).expectations_files() + [android_expectations_file]
def start_http_server(self, additional_dirs=None, number_of_servers=0):
@@ -230,41 +232,6 @@
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 and small directories.
- return set([
- # Skip tests of other platforms to save time.
- 'platform/gtk',
- 'platform/mac',
- 'platform/mac-wk2',
- 'platform/qt',
- 'platform/win',
-
- # Features not supported: http://crbug.com/145338.
- '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',
-
- # Skip webgl tests: http://crbug.com/135877.
- 'compositing/webgl',
- 'fast/canvas/webgl',
- 'http/tests/canvas/webgl',
- 'platform/chromium/virtual/gpu/fast/canvas/webgl',
- 'platform/chromium/virtual/threaded/compositing/webgl',
- ])
-
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().
