Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 558f7dcf authored by Iain Merrick's avatar Iain Merrick
Browse files

Merge WebKit at r65615 : Ignore http/tests/appcache/origin-quota.html 

This patch modifies the old-style hard-coded ignore list. The new-style
text file (in external/webkit/LayoutTests/platform/android) has been
modified separately, as part of the normal WebKit merge process.

Test added in http://trac.webkit.org/changeset/64613
Needs clearAllApplicationCaches() callback. See http://b/issue?id=2944196

Change-Id: I31655c363c93eada40d01123e9c14c0d03bdba7b
parent 27b257db

tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ public class FileFilter { 
        ignoreResultList.add("http/tests/appcache/fallback.html"); // http://b/issue?id=2713004

        ignoreResultList.add("http/tests/appcache/foreign-iframe-main.html"); // flaky - skips states

        ignoreResultList.add("http/tests/appcache/manifest-with-empty-file.html"); // flaky

        ignoreResultList.add("http/tests/appcache/origin-quota.html"); // needs clearAllApplicationCaches(), see http://b/issue?id=2944196

        ignoreResultList.add("storage/database-lock-after-reload.html"); // Succeeds but DumpRenderTree does not read result correctly

        ignoreResultList.add("storage/hash-change-with-xhr.html"); // Succeeds but DumpRenderTree does not read result correctly

        ignoreResultList.add("storage/open-database-creation-callback-isolated-world.html"); // Requires layoutTestController.evaluateScriptInIsolatedWorld()