summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 15:31:37 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-02 15:31:37 +0000
commita1a2e8ea06bdd7220d57fa7d193787374c0f296e (patch)
treed44392c0965af4b1ea59ae5d712c1c31ca346bdc
parent7a38a58dab959c0dfedf95f0c3af2583d2fe0d15 (diff)
downloadchromium_src-a1a2e8ea06bdd7220d57fa7d193787374c0f296e.zip
chromium_src-a1a2e8ea06bdd7220d57fa7d193787374c0f296e.tar.gz
chromium_src-a1a2e8ea06bdd7220d57fa7d193787374c0f296e.tar.bz2
Rebaseline deep-recursion, additional test cases were added upstream.
Review URL: http://codereview.chromium.org/13048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6217 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README4
-rw-r--r--webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/deep-recursion-test-expected.txt2
-rw-r--r--webkit/tools/layout_tests/test_lists/linux/tests_fixable.txt3
-rw-r--r--webkit/tools/layout_tests/test_lists/win/tests_fixable.txt3
4 files changed, 5 insertions, 7 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README
index e23018a..0ddcb993 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/README
@@ -27,6 +27,8 @@ Only error messages are different.
deep-recursion.html
--------------------------
It takes more than 1000 recursive calls to get a stack overflow in V8.
+We differ from the upstream expected results because the v8 exception message
+doesn't have a trailing period. This is intentional for consistency.
function-decompilation-operators.html
function-prototype.html
@@ -113,4 +115,4 @@ Only difference is the parse error message.
regexp-overflow
--------------------------
This tests artificial limits on the size of regexps. We allow
-simple regexps to be larger than what jsc allows \ No newline at end of file
+simple regexps to be larger than what jsc allows
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/deep-recursion-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/deep-recursion-test-expected.txt
index a2a8246..14cb370 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/deep-recursion-test-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/js/deep-recursion-test-expected.txt
@@ -5,6 +5,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
FAIL msg should be RangeError: Maximum call stack size exceeded.. Was RangeError: Maximum call stack size exceeded.
FAIL msg should be RangeError: Maximum call stack size exceeded.. Was RangeError: Maximum call stack size exceeded.
+FAIL msg should be RangeError: Maximum call stack size exceeded.. Was RangeError: Maximum call stack size exceeded.
+FAIL msg should be RangeError: Maximum call stack size exceeded.. Was RangeError: Maximum call stack size exceeded.
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/webkit/tools/layout_tests/test_lists/linux/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/linux/tests_fixable.txt
index 067a859..056d947 100644
--- a/webkit/tools/layout_tests/test_lists/linux/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/linux/tests_fixable.txt
@@ -1135,9 +1135,6 @@ LayoutTests/plugins/netscape-plugin-setwindow-size-2.html = FAIL
// MERGE 38600:38625: Regressions
LayoutTests/fast/frames/iframe-option-crash.xhtml = FAIL
-// MERGE 38600:38625: Expectations changed upstream
-LayoutTests/fast/js/deep-recursion-test.html = FAIL
-
// MERGE 38625:38653: Expectations changed upstream
LayoutTests/editing/deleting/delete-by-word-001.html = FAIL
LayoutTests/editing/deleting/delete-by-word-002.html = FAIL
diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
index 4b688c5..1dc0960 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -1135,9 +1135,6 @@ LayoutTests/plugins/netscape-plugin-setwindow-size-2.html = FAIL
// MERGE 38600:38625: Regressions
LayoutTests/fast/frames/iframe-option-crash.xhtml = FAIL
-// MERGE 38600:38625: Expectations changed upstream
-LayoutTests/fast/js/deep-recursion-test.html = FAIL
-
// MERGE 38625:38653: Expectations changed upstream
LayoutTests/editing/deleting/delete-by-word-001.html = FAIL
LayoutTests/editing/deleting/delete-by-word-002.html = FAIL