summaryrefslogtreecommitdiffstats
path: root/tests/DumpRenderTree
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2010-08-12 16:06:29 +0100
committerBen Murdoch <benm@google.com>2010-08-13 13:18:41 +0100
commite7611352ae40cff5aba1f28622a77e16efc99e51 (patch)
tree03765462f167134f7e223876b8ef0abd928f625a /tests/DumpRenderTree
parentbb3ed528035b9fe09514434cc192d251dcc143af (diff)
downloadframeworks_base-e7611352ae40cff5aba1f28622a77e16efc99e51.zip
frameworks_base-e7611352ae40cff5aba1f28622a77e16efc99e51.tar.gz
frameworks_base-e7611352ae40cff5aba1f28622a77e16efc99e51.tar.bz2
Merge WebKit at r65072 : Update DRT ignore list.
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: If13dda2caa467b771d4a21d60463319019cc7679
Diffstat (limited to 'tests/DumpRenderTree')
-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 9f580a3..784a6d5 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