summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplesner@google.com <plesner@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 08:21:32 +0000
committerplesner@google.com <plesner@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-05 08:21:32 +0000
commitbd7105a8391c87c2c3e443392f58aa2b1a61dcbf (patch)
treecbe03269cf49708b913aa357c9bcc84d7b928370
parent409f617b0cf0d4d642f05060cf5e18fe7b3ed609 (diff)
downloadchromium_src-bd7105a8391c87c2c3e443392f58aa2b1a61dcbf.zip
chromium_src-bd7105a8391c87c2c3e443392f58aa2b1a61dcbf.tar.gz
chromium_src-bd7105a8391c87c2c3e443392f58aa2b1a61dcbf.tar.bz2
Skipped LayoutTests/fast/regex/test1.html. 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. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10977 0039d316-1c4b-4281-b951-d872f2087c98
-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
// -----------------------------------------------------------------