diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-22 09:54:43 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-22 09:54:43 +0000 |
| commit | 0693874df4a57a46c63bb660ff677a4b4a2eec14 (patch) | |
| tree | e449b7bbe466e80958fdaef30063006b2d97bb69 | |
| parent | 0cb274cf50a33d8db9a61847cfba00eceb1b6556 (diff) | |
| download | chromium_src-0693874df4a57a46c63bb660ff677a4b4a2eec14.zip chromium_src-0693874df4a57a46c63bb660ff677a4b4a2eec14.tar.gz chromium_src-0693874df4a57a46c63bb660ff677a4b4a2eec14.tar.bz2 | |
Revert 36857 - Fix websocket_server.py to use websocket/tests/handler_map.txt
See http://trac.webkit.org/changeset/53592/trunk/WebKitTools/Scripts/runwebkittests
BUG=32863
TEST=websocket/tests/urlnotrailingslash.html passes
Review URL: http://codereview.chromium.org/543171
TBR=ukai@chromium.org
Review URL: http://codereview.chromium.org/552105
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36859 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 1 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 52152ff..bac80eb 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3048,4 +3048,5 @@ BUG_DPRANKE WIN : fast/media/lifetime.html = PASS TIMEOUT BUG_DPRANKE WIN : storage/domstorage/sessionstorage/delete-removal.html = PASS CRASH // WebKit roll 53585 -> 53655 +BUG32863 WIN LINUX MAC : websocket/tests/url-no-trailing-slash.html = TEXT BUG32864 WIN LINUX MAC : plugins/mouse-events-fixedpos.html = TEXT 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 be534f9..090a5d2 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 @@ -126,7 +126,6 @@ class PyWebSocket(http_server.Lighttpd): '-p', str(self._port), '-d', self._layout_tests, '-s', self._web_socket_tests, - '-m', os.path.join(self._web_socket_tests, 'handler_map.txt'), '-l', error_log, ] if self._use_tls: |