summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-04-29 03:27:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-29 03:27:29 -0700
commit286fbce557fa5b027ffb3c5a5b562bfc5a3b4748 (patch)
treeec5ff987bc660393626a295126b8b58ce9c37029 /tests
parent8c2d5cf82654c351959f31351967424982b08839 (diff)
parent79a81c2d380167cdd34a51a068bb8c8c490b0d6b (diff)
downloadframeworks_base-286fbce557fa5b027ffb3c5a5b562bfc5a3b4748.zip
frameworks_base-286fbce557fa5b027ffb3c5a5b562bfc5a3b4748.tar.gz
frameworks_base-286fbce557fa5b027ffb3c5a5b562bfc5a3b4748.tar.bz2
Merge "Merge webkit.org at r55033 : Update the WebKit UA string and LayoutTest ignore list"
Diffstat (limited to 'tests')
-rw-r--r--tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
index 221b218..e28603e 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
@@ -82,8 +82,10 @@ 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/events/touch/basic-touch-events.html"); // Requires multi-touch
- ignoreResultList.add("fast/events/touch/send-oncancel-event.html"); // Expected output is incorrect upstream. See WebKit bug 37830.
+ ignoreResultList.add("fast/events/touch/basic-multi-touch-events.html"); // Requires multi-touch
+ ignoreResultList.add("fast/events/touch/basic-single-touch-events.html"); // Delta of touch move is not great enough for Android. Fixed upstream in WebKit change 58208.
+ ignoreResultList.add("fast/events/touch/send-oncancel-event.html"); // Expected output is incorrect. Fixed upstream in WebKit change 58058.
+ ignoreResultList.add("fast/events/touch/touch-target.html"); // Requires multi-touch
ignoreResultList.add("http/tests/appcache/empty-manifest.html"); // flaky
ignoreResultList.add("http/tests/appcache/foreign-iframe-main.html"); // flaky - skips states
ignoreResultList.add("http/tests/appcache/manifest-with-empty-file.html"); // flaky