diff options
| author | Ben Murdoch <benm@google.com> | 2010-08-12 16:10:15 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-08-13 12:42:04 +0100 |
| commit | c73b2eb9ba27a7c82a9a2ffa7687e6f9a526d0f6 (patch) | |
| tree | 3fa75c6e3b8a5b76a02b1d349671cdc420368820 /LayoutTests | |
| parent | 71592cfffc4caa56c15e84b432898708f043d1d3 (diff) | |
| download | external_webkit-c73b2eb9ba27a7c82a9a2ffa7687e6f9a526d0f6.zip external_webkit-c73b2eb9ba27a7c82a9a2ffa7687e6f9a526d0f6.tar.gz external_webkit-c73b2eb9ba27a7c82a9a2ffa7687e6f9a526d0f6.tar.bz2 | |
Merge WebKit at r65072 : Update test_expectations.
This merge introduces two new Geolocation tests that to pass we need
a new LayoutTestController function. We ignore those tests until this
function is added - see b/2914450
Change-Id: I6929172fd6822b3c2c588693d743362f7edbca4f
Diffstat (limited to 'LayoutTests')
| -rw-r--r-- | LayoutTests/platform/android/test_expectations.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/LayoutTests/platform/android/test_expectations.txt b/LayoutTests/platform/android/test_expectations.txt index 6d01fd9..a21fd86 100644 --- a/LayoutTests/platform/android/test_expectations.txt +++ b/LayoutTests/platform/android/test_expectations.txt @@ -28,6 +28,8 @@ ietestcenter/Javascript/15.4.4.15-3-8.html SKIP // hangs the layout tests http:/ // This first block of tests are for features for which Android // should pass all tests. They are skipped only temporarily. // TODO: Fix these failing tests and remove them from this list. +fast/dom/Geolocation/delayed-permission-allowed.html IGNORE_RESULT // Requires layoutTestController.permissionSet b/2914450 +fast/dom/Geolocation/delayed-permission-denied.html IGNORE_RESULT // Requires layoutTestController.permissionSet b/2914450 fast/events/touch/basic-multi-touch-events.html IGNORE_RESULT // Requires multi-touch fast/events/touch/touch-target.html IGNORE_RESULT // Requires multi-touch http/tests/appcache/empty-manifest.html IGNORE_RESULT // flaky |