diff options
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 |