diff options
| author | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-27 17:42:06 +0000 |
|---|---|---|
| committer | dglazkov@chromium.org <dglazkov@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-27 17:42:06 +0000 |
| commit | 0ea97a816da86125efe8ff8c60b09d5c2dd1bda6 (patch) | |
| tree | cf6583054936013ce1fe42cdb358eedf020472c1 /webkit/tools/layout_tests | |
| parent | 31e38efbd0c00865a126c6fecad527d119a5a52f (diff) | |
| download | chromium_src-0ea97a816da86125efe8ff8c60b09d5c2dd1bda6.zip chromium_src-0ea97a816da86125efe8ff8c60b09d5c2dd1bda6.tar.gz chromium_src-0ea97a816da86125efe8ff8c60b09d5c2dd1bda6.tar.bz2 | |
WebKit Roll 55250:55339.
TBR=dumi
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/660246
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 13 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py | 8 |
2 files changed, 9 insertions, 12 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 54582b3..931cf72 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -727,15 +727,6 @@ BUG20226 DEFER : fast/forms/input-selectedoption.html = FAIL // Add support for inspector layout tests. BUG26734 LINUX MAC SKIP : inspector = PASS BUG26734 LINUX MAC SKIP : http/tests/inspector = PASS -BUG26734 SKIP : inspector/console-format-collections.html = TEXT -BUG26734 SKIP : inspector/console-format.html = TEXT -BUG36986 SKIP : inspector/timeline-enum-stability.html = TEXT -BUG36986 SKIP : inspector/timeline-event-dispatch.html = TEXT -BUG36986 SKIP : inspector/timeline-mark-timeline.html = TEXT -BUG36986 SKIP : inspector/timeline-network-resource.html = TEXT -BUG36986 SKIP : inspector/timeline-paint.html = TEXT -BUG36986 SKIP : inspector/timeline-parse-html.html = TEXT - // These tests are disabled until <audio> and <video> tags are supported. // Disable <video> and <audio> tests for mac and linux until there is @@ -2940,3 +2931,7 @@ BUG36681 : java/array-return.html = TEXT // WebKit roll 55241 to 55250 BUG36846 : java/java-and-plugins.html = TEXT + +// WebKit roll 55250 to 55339 +BUG36966 : fast/loader/about-blank-hash-kept.html = FAIL +BUG36967 : java/array-sort.html = FAIL diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py index 6c74c30..ed3cbf4 100644 --- a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py +++ b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py @@ -117,10 +117,12 @@ class PyWebSocket(http_server.Lighttpd): python_interp = sys.executable pywebsocket_base = path_utils.path_from_base( - 'third_party', 'WebKit', 'WebKitTools', 'pywebsocket') + 'third_party', 'WebKit', 'WebKitTools', 'Scripts', 'webkitpy', + 'thirdparty', 'pywebsocket') pywebsocket_script = path_utils.path_from_base( - 'third_party', 'WebKit', 'WebKitTools', 'pywebsocket', - 'mod_pywebsocket', 'standalone.py') + 'third_party', 'WebKit', 'WebKitTools', 'Scripts', + 'webkitpy', 'thirdparty', 'pywebsocket', 'mod_pywebsocket', + 'standalone.py') start_cmd = [ python_interp, pywebsocket_script, '-p', str(self._port), |