Merge "Puts two regex layout tests back on the DumpRenderTree skipped list"

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
index eecd00a..e3486a0 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/FileFilter.java
@@ -24,9 +24,8 @@ public class FileFilter {
     private static final String LOGTAG = "FileFilter";
 
     // Returns whether we should ignore this test and skip running it.
-    // Currently we use this only for tests that crash the browser.
-    // TODO: Once these crashes are fixed, we should probably eliminate this
-    // method, as no test should crash.
+    // Currently we use this only for tests that crash or hang DumpRenderTree.
+    // TODO: Fix these and eliminate this method.
     public static boolean ignoreTest(String file) {
         for (int i = 0; i < ignoreTestList.length; i++) {
             if (file.endsWith(ignoreTestList[i])) {
@@ -74,6 +73,8 @@ public class FileFilter {
 
     static final String[] ignoreTestList = {
         "fast/js/regexp-charclass-crash.html", // RegExp is too large, causing OOM
+        "fast/regex/test1.html", // Causes DumpRenderTree to hang with V8
+        "fast/regex/slow.html", // Causes DumpRenderTree to hang with V8
         "editing/selection/move-left-right.html" // Causes DumpRenderTree to hang
     };