summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_ignored.txt5
2 files changed, 6 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index bdcdab3..dffe959 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ deps = {
"http://gyp.googlecode.com/svn/trunk",
"src/v8":
- "http://v8.googlecode.com/svn/trunk@1423",
+ "http://v8.googlecode.com/svn/branches/bleeding_edge",
"src/webkit/data/layout_tests/LayoutTests":
Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
diff --git a/webkit/tools/layout_tests/test_lists/tests_ignored.txt b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
index a01b464..93add1a 100644
--- a/webkit/tools/layout_tests/test_lists/tests_ignored.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_ignored.txt
@@ -38,6 +38,11 @@ SKIP : LayoutTests/http/tests/wml = FAIL
// most likely these tests will always be JSC specific.
SKIP : LayoutTests/fast/profiler = FAIL TIMEOUT
+// This test doesn't terminate because it contains exponential
+// regexps. It is safe to disable because we run the same tests
+// (sans the nonterminating ones) as part of the v8 tests.
+SKIP : LayoutTests/fast/regex/test1.html = PASS
+
// -----------------------------------------------------------------
// FAILING TESTS
// -----------------------------------------------------------------