summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Ben Murdoch <benm@google.com> 2010-08-13 05:20:08 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-08-13 05:20:08 -0700
commit3778a632a052fc1118fb430cb715beec38e97b42 (patch)
tree4c65ae3fa2f90d0e6410a1216145e0d1b43d1056
parent713ad437d69d524edaf5a3d7800fac0bbe07cf58 (diff)
parente7611352ae40cff5aba1f28622a77e16efc99e51 (diff)
Merge "Merge WebKit at r65072 : Update DRT ignore list."
-rw-r--r--tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
index 9f580a380bc1..784a6d56e5d3 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
@@ -89,6 +89,8 @@ public class FileFilter {
// 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.
+ ignoreResultList.add("fast/dom/Geolocation/delayed-permission-allowed.html"); // requires layoutTestController.permissionSet
+ ignoreResultList.add("fast/dom/Geolocation/delayed-permission-denied.html"); // requires layoutTestController.permissionSet
ignoreResultList.add("fast/events/touch/basic-multi-touch-events.html"); // Requires multi-touch
ignoreResultList.add("fast/events/touch/touch-target.html"); // Requires multi-touch
ignoreResultList.add("http/tests/appcache/empty-manifest.html"); // flaky