2011-07-05 Yuta Kitamura <yutak@chromium.org>
authoryutak@chromium.org <yutak@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jul 2011 08:06:46 +0000 (08:06 +0000)
committeryutak@chromium.org <yutak@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Jul 2011 08:06:46 +0000 (08:06 +0000)
        WebSocket: Move current WebSocket tests to a new directory
        https://bugs.webkit.org/show_bug.cgi?id=63931

        Reviewed by Kent Tamura.

        In order to put tests for new WebSocket protocol, existing tests for the old protocol
        need to be moved to a subdirectory (namely "hixie76").

        Minimum changes have been made to tests and test results, such as:
        - Update links to resource files (e.g. "../../../js-test-pre.js" to "../../../../js-test-pre.js"), and
        - Update WebSocket URLs in the tests (i.e. adding "hixie76/" to ws:// and wss:// URLs).

        Skipped and test_expectations.txt are also updated accordingly.

        * http/tests/websocket/tests/handler_map.txt:
        This is the only file left in the current directory. This file defines the handler location
        to which accesses to the root directory (e.g. "ws://example.com/") are redirected, and
        cannot be moved.
        * http/tests/websocket/tests/hixie76/alert-in-event-handler-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/alert-in-event-handler-expected.txt.
        * http/tests/websocket/tests/hixie76/alert-in-event-handler.html: Renamed from LayoutTests/http/tests/websocket/tests/alert-in-event-handler.html.
        * http/tests/websocket/tests/hixie76/bad-handshake-crash-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bad-handshake-crash-expected.txt.
        * http/tests/websocket/tests/hixie76/bad-handshake-crash.html: Renamed from LayoutTests/http/tests/websocket/tests/bad-handshake-crash.html.
        * http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/bad-handshake-crash_wsh.py.
        * http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
        * http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars.html: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-control-chars.html.
        * http/tests/websocket/tests/hixie76/bad-sub-protocol-empty-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-empty-expected.txt.
        * http/tests/websocket/tests/hixie76/bad-sub-protocol-empty.html: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-empty.html.
        * http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt.
        * http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii.html: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-non-ascii.html.
        * http/tests/websocket/tests/hixie76/bufferedAmount-after-close-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bufferedAmount-after-close-expected.txt.
        * http/tests/websocket/tests/hixie76/bufferedAmount-after-close.html: Renamed from LayoutTests/http/tests/websocket/tests/bufferedAmount-after-close.html.
        * http/tests/websocket/tests/hixie76/client-close-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/client-close-expected.txt.
        * http/tests/websocket/tests/hixie76/client-close.html: Renamed from LayoutTests/http/tests/websocket/tests/client-close.html.
        * http/tests/websocket/tests/hixie76/client-close_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/client-close_wsh.py.
        * http/tests/websocket/tests/hixie76/close-before-open-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-before-open-expected.txt.
        * http/tests/websocket/tests/hixie76/close-before-open.html: Renamed from LayoutTests/http/tests/websocket/tests/close-before-open.html.
        * http/tests/websocket/tests/hixie76/close-event-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-event-expected.txt.
        * http/tests/websocket/tests/hixie76/close-event.html: Renamed from LayoutTests/http/tests/websocket/tests/close-event.html.
        * http/tests/websocket/tests/hixie76/close-on-navigate-new-location-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-on-navigate-new-location-expected.txt.
        * http/tests/websocket/tests/hixie76/close-on-navigate-new-location.html: Renamed from LayoutTests/http/tests/websocket/tests/close-on-navigate-new-location.html.
        * http/tests/websocket/tests/hixie76/close-on-unload-and-force-gc-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-and-force-gc-expected.txt.
        * http/tests/websocket/tests/hixie76/close-on-unload-and-force-gc.html: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-and-force-gc.html.
        * http/tests/websocket/tests/hixie76/close-on-unload-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-expected.txt.
        * http/tests/websocket/tests/hixie76/close-on-unload-reference-in-parent-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-reference-in-parent-expected.txt.
        * http/tests/websocket/tests/hixie76/close-on-unload-reference-in-parent.html: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-reference-in-parent.html.
        * http/tests/websocket/tests/hixie76/close-on-unload.html: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload.html.
        * http/tests/websocket/tests/hixie76/close-on-unload_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload_wsh.py.
        * http/tests/websocket/tests/hixie76/close-unref-websocket-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-unref-websocket-expected.txt.
        * http/tests/websocket/tests/hixie76/close-unref-websocket.html: Renamed from LayoutTests/http/tests/websocket/tests/close-unref-websocket.html.
        * http/tests/websocket/tests/hixie76/cross-origin-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/cross-origin-expected.txt.
        * http/tests/websocket/tests/hixie76/cross-origin.html: Renamed from LayoutTests/http/tests/websocket/tests/cross-origin.html.
        * http/tests/websocket/tests/hixie76/echo-challenge_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/echo-challenge_wsh.py.
        * http/tests/websocket/tests/hixie76/echo-cookie_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/echo-cookie_wsh.py.
        * http/tests/websocket/tests/hixie76/echo-location_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/echo-location_wsh.py.
        * http/tests/websocket/tests/hixie76/echo_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/echo_wsh.py.
        * http/tests/websocket/tests/hixie76/error-detect-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/error-detect-expected.txt.
        * http/tests/websocket/tests/hixie76/error-detect.html: Renamed from LayoutTests/http/tests/websocket/tests/error-detect.html.
        * http/tests/websocket/tests/hixie76/fixed-origin_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/fixed-origin_wsh.py.
        * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer-expected.txt.
        * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer.html: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer.html.
        * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer_wsh.py.
        * http/tests/websocket/tests/hixie76/frame-length-overflow-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-overflow-expected.txt.
        * http/tests/websocket/tests/hixie76/frame-length-overflow.html: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-overflow.html.
        * http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-overflow_wsh.py.
        * http/tests/websocket/tests/hixie76/frame-length-skip-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-skip-expected.txt.
        * http/tests/websocket/tests/hixie76/frame-length-skip.html: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-skip.html.
        * http/tests/websocket/tests/hixie76/frame-length-skip_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-skip_wsh.py.
        * http/tests/websocket/tests/hixie76/frame-lengths-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/frame-lengths-expected.txt.
        * http/tests/websocket/tests/hixie76/frame-lengths.html: Renamed from LayoutTests/http/tests/websocket/tests/frame-lengths.html.
        * http/tests/websocket/tests/hixie76/handshake-challenge-randomness-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-challenge-randomness-expected.txt.
        * http/tests/websocket/tests/hixie76/handshake-challenge-randomness.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-challenge-randomness.html.
        * http/tests/websocket/tests/hixie76/handshake-error-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-error-expected.txt.
        * http/tests/websocket/tests/hixie76/handshake-error.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-error.html.
        * http/tests/websocket/tests/hixie76/handshake-error_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-error_wsh.py.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-cross-origin-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-cross-origin-expected.txt.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-cross-origin.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-cross-origin.html.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength-expected.txt.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength.html.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength_wsh.py.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header-expected.txt.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header.html.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header_wsh.py.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr-expected.txt.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr.html.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr_wsh.py.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header-expected.txt.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header.html.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header_wsh.py.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null-expected.txt.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null.html.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null_wsh.py.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-sub-protocol-mismatch-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch-expected.txt.
        * http/tests/websocket/tests/hixie76/handshake-fail-by-sub-protocol-mismatch.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch.html.
        * http/tests/websocket/tests/hixie76/hanging-handshake_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/hanging-handshake_wsh.py.
        * http/tests/websocket/tests/hixie76/httponly-cookie-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/httponly-cookie-expected.txt.
        * http/tests/websocket/tests/hixie76/httponly-cookie.pl: Renamed from LayoutTests/http/tests/websocket/tests/httponly-cookie.pl.
        * http/tests/websocket/tests/hixie76/long-invalid-header-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/long-invalid-header-expected.txt.
        * http/tests/websocket/tests/hixie76/long-invalid-header.html: Renamed from LayoutTests/http/tests/websocket/tests/long-invalid-header.html.
        * http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/long-invalid-header_wsh.py.
        * http/tests/websocket/tests/hixie76/multiple-connections-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/multiple-connections-expected.txt.
        * http/tests/websocket/tests/hixie76/multiple-connections.html: Renamed from LayoutTests/http/tests/websocket/tests/multiple-connections.html.
        * http/tests/websocket/tests/hixie76/no-query_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/no-query_wsh.py.
        * http/tests/websocket/tests/hixie76/null-character-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/null-character-expected.txt.
        * http/tests/websocket/tests/hixie76/null-character.html: Renamed from LayoutTests/http/tests/websocket/tests/null-character.html.
        * http/tests/websocket/tests/hixie76/origin-test_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/origin-test_wsh.py.
        * http/tests/websocket/tests/hixie76/protocol-test_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/protocol-test_wsh.py.
        * http/tests/websocket/tests/hixie76/reload-crash-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/reload-crash-expected.txt.
        * http/tests/websocket/tests/hixie76/reload-crash.html: Renamed from LayoutTests/http/tests/websocket/tests/reload-crash.html.
        * http/tests/websocket/tests/hixie76/resources/close-on-unload-iframe-reference-in-parent.html: Renamed from LayoutTests/http/tests/websocket/tests/resources/close-on-unload-iframe-reference-in-parent.html.
        * http/tests/websocket/tests/hixie76/resources/close-on-unload-iframe.html: Renamed from LayoutTests/http/tests/websocket/tests/resources/close-on-unload-iframe.html.
        * http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html: Added.
        * http/tests/websocket/tests/hixie76/send-after-close-on-unload-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/send-after-close-on-unload-expected.txt.
        * http/tests/websocket/tests/hixie76/send-after-close-on-unload.html: Renamed from LayoutTests/http/tests/websocket/tests/send-after-close-on-unload.html.
        * http/tests/websocket/tests/hixie76/send-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/send-expected.txt.
        * http/tests/websocket/tests/hixie76/send-throw-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/send-throw-expected.txt.
        * http/tests/websocket/tests/hixie76/send-throw.html: Renamed from LayoutTests/http/tests/websocket/tests/send-throw.html.
        * http/tests/websocket/tests/hixie76/send.html: Renamed from LayoutTests/http/tests/websocket/tests/send.html.
        * http/tests/websocket/tests/hixie76/send2_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/send2_wsh.py.
        * http/tests/websocket/tests/hixie76/send_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/send_wsh.py.
        * http/tests/websocket/tests/hixie76/server-close-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/server-close-expected.txt.
        * http/tests/websocket/tests/hixie76/server-close.html: Renamed from LayoutTests/http/tests/websocket/tests/server-close.html.
        * http/tests/websocket/tests/hixie76/server-close_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/server-close_wsh.py.
        * http/tests/websocket/tests/hixie76/simple-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/simple-expected.txt.
        * http/tests/websocket/tests/hixie76/simple-stress-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/simple-stress-expected.txt.
        * http/tests/websocket/tests/hixie76/simple-stress.html: Renamed from LayoutTests/http/tests/websocket/tests/simple-stress.html.
        * http/tests/websocket/tests/hixie76/simple.html: Renamed from LayoutTests/http/tests/websocket/tests/simple.html.
        * http/tests/websocket/tests/hixie76/simple_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/simple_wsh.py.
        * http/tests/websocket/tests/hixie76/sub-protocol-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/sub-protocol-expected.txt.
        * http/tests/websocket/tests/hixie76/sub-protocol-with-space-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/sub-protocol-with-space-expected.txt.
        * http/tests/websocket/tests/hixie76/sub-protocol-with-space.html: Renamed from LayoutTests/http/tests/websocket/tests/sub-protocol-with-space.html.
        * http/tests/websocket/tests/hixie76/sub-protocol.html: Renamed from LayoutTests/http/tests/websocket/tests/sub-protocol.html.
        * http/tests/websocket/tests/hixie76/unicode-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/unicode-expected.txt.
        * http/tests/websocket/tests/hixie76/unicode.html: Renamed from LayoutTests/http/tests/websocket/tests/unicode.html.
        * http/tests/websocket/tests/hixie76/unicode_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/unicode_wsh.py.
        * http/tests/websocket/tests/hixie76/unknown-frame-type_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/unknown-frame-type_wsh.py.
        * http/tests/websocket/tests/hixie76/url-no-trailing-slash-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-no-trailing-slash-expected.txt.
        * http/tests/websocket/tests/hixie76/url-no-trailing-slash.html: Renamed from LayoutTests/http/tests/websocket/tests/url-no-trailing-slash.html.
        * http/tests/websocket/tests/hixie76/url-parsing-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-parsing-expected.txt.
        * http/tests/websocket/tests/hixie76/url-parsing.html: Renamed from LayoutTests/http/tests/websocket/tests/url-parsing.html.
        * http/tests/websocket/tests/hixie76/url-with-credential-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-with-credential-expected.txt.
        * http/tests/websocket/tests/hixie76/url-with-credential.html: Renamed from LayoutTests/http/tests/websocket/tests/url-with-credential.html.
        * http/tests/websocket/tests/hixie76/url-with-empty-query-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-with-empty-query-expected.txt.
        * http/tests/websocket/tests/hixie76/url-with-empty-query.html: Renamed from LayoutTests/http/tests/websocket/tests/url-with-empty-query.html.
        * http/tests/websocket/tests/hixie76/url-with-query-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-with-query-expected.txt.
        * http/tests/websocket/tests/hixie76/url-with-query-for-no-query-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-with-query-for-no-query-expected.txt.
        * http/tests/websocket/tests/hixie76/url-with-query-for-no-query.html: Renamed from LayoutTests/http/tests/websocket/tests/url-with-query-for-no-query.html.
        * http/tests/websocket/tests/hixie76/url-with-query.html: Renamed from LayoutTests/http/tests/websocket/tests/url-with-query.html.
        * http/tests/websocket/tests/hixie76/websocket-event-target-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/websocket-event-target-expected.txt.
        * http/tests/websocket/tests/hixie76/websocket-event-target.html: Renamed from LayoutTests/http/tests/websocket/tests/websocket-event-target.html.
        * http/tests/websocket/tests/hixie76/websocket-pending-activity-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/websocket-pending-activity-expected.txt.
        * http/tests/websocket/tests/hixie76/websocket-pending-activity.html: Renamed from LayoutTests/http/tests/websocket/tests/websocket-pending-activity.html.
        * http/tests/websocket/tests/hixie76/websocket-protocol-ignored-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/websocket-protocol-ignored-expected.txt.
        * http/tests/websocket/tests/hixie76/websocket-protocol-ignored.html: Renamed from LayoutTests/http/tests/websocket/tests/websocket-protocol-ignored.html.
        * http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-onmessage-crash-expected.txt.
        * http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-onmessage-crash.html.
        * http/tests/websocket/tests/hixie76/workers/close-in-shared-worker-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-shared-worker-expected.txt.
        * http/tests/websocket/tests/hixie76/workers/close-in-shared-worker.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-shared-worker.html.
        * http/tests/websocket/tests/hixie76/workers/close-in-worker-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-worker-expected.txt.
        * http/tests/websocket/tests/hixie76/workers/close-in-worker.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-worker.html.
        * http/tests/websocket/tests/hixie76/workers/resources/close-in-onmessage-crash.js: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/close-in-onmessage-crash.js.
        (runTests.try.ws.onopen):
        (runTests.try.ws.onmessage):
        (runTests.try.ws.onclose):
        (runTests):
        * http/tests/websocket/tests/hixie76/workers/resources/close-in-worker.js: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/close-in-worker.js.
        (handleConnect.self.postMessage):
        (handleConnect):
        (runTests.try.ws.onopen):
        (runTests.try.ws.onclose):
        (runTests):
        * http/tests/websocket/tests/hixie76/workers/resources/echo-challenge_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/echo-challenge_wsh.py.
        * http/tests/websocket/tests/hixie76/workers/resources/echo_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/echo_wsh.py.
        * http/tests/websocket/tests/hixie76/workers/resources/simple_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/simple_wsh.py.
        * http/tests/websocket/tests/hixie76/workers/resources/worker-handshake-challenge-randomness.js: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/worker-handshake-challenge-randomness.js.
        (endTest):
        (runTests.try.ws1.onmessage):
        (runTests.try.ws1.onclose.ws2.onmessage):
        (runTests.try.ws1.onclose.ws2.onclose):
        (runTests.try.ws1.onclose):
        (runTests):
        * http/tests/websocket/tests/hixie76/workers/resources/worker-simple.js: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/worker-simple.js.
        (handleConnect.self.postMessage):
        (handleConnect):
        (runTests.try.ws.onopen):
        (runTests.try.ws.onmessage):
        (runTests.try.ws.onclose):
        (runTests):
        * http/tests/websocket/tests/hixie76/workers/shared-worker-simple-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/shared-worker-simple-expected.txt.
        * http/tests/websocket/tests/hixie76/workers/shared-worker-simple.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/shared-worker-simple.html.
        * http/tests/websocket/tests/hixie76/workers/worker-handshake-challenge-randomness-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/worker-handshake-challenge-randomness-expected.txt.
        * http/tests/websocket/tests/hixie76/workers/worker-handshake-challenge-randomness.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/worker-handshake-challenge-randomness.html.
        * http/tests/websocket/tests/hixie76/workers/worker-simple-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/worker-simple-expected.txt.
        * http/tests/websocket/tests/hixie76/workers/worker-simple.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/worker-simple.html.
        * http/tests/websocket/tests/resources/reload-crash-iframe.html: Removed.
        * platform/chromium-linux/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt: Renamed from LayoutTests/platform/chromium-linux/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
        * platform/chromium-linux/http/tests/websocket/tests/hixie76/url-parsing-expected.txt: Renamed from LayoutTests/platform/chromium-win/http/tests/websocket/tests/url-parsing-expected.txt.
        * platform/chromium-mac/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt: Renamed from LayoutTests/platform/chromium-mac/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
        * platform/chromium-mac/http/tests/websocket/tests/hixie76/url-parsing-expected.txt: Renamed from LayoutTests/platform/chromium-linux/http/tests/websocket/tests/url-parsing-expected.txt.
        * platform/chromium-win/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt: Renamed from LayoutTests/platform/chromium-win/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
        * platform/chromium-win/http/tests/websocket/tests/hixie76/url-parsing-expected.txt: Renamed from LayoutTests/platform/chromium-mac/http/tests/websocket/tests/url-parsing-expected.txt.
        * platform/chromium/test_expectations.txt:
        * platform/qt-arm/Skipped:
        * platform/qt-wk2/Skipped:
        * platform/qt/http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii-expected.txt: Renamed from LayoutTests/platform/qt/http/tests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt.
        * platform/win/Skipped:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@90445 268f45cc-cd09-0410-ab3c-d52691b4dbfc

168 files changed:
LayoutTests/ChangeLog
LayoutTests/http/tests/websocket/tests/handler_map.txt
LayoutTests/http/tests/websocket/tests/hixie76/alert-in-event-handler-expected.txt [moved from LayoutTests/http/tests/websocket/tests/alert-in-event-handler-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/alert-in-event-handler.html [moved from LayoutTests/http/tests/websocket/tests/alert-in-event-handler.html with 72% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bad-handshake-crash-expected.txt [moved from LayoutTests/http/tests/websocket/tests/bad-handshake-crash-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bad-handshake-crash.html [moved from LayoutTests/http/tests/websocket/tests/bad-handshake-crash.html with 60% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py [moved from LayoutTests/http/tests/websocket/tests/bad-handshake-crash_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt [moved from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars.html [moved from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-control-chars.html with 76% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bad-sub-protocol-empty-expected.txt [moved from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-empty-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bad-sub-protocol-empty.html [moved from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-empty.html with 64% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii-expected.txt [moved from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii.html [moved from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-non-ascii.html with 80% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bufferedAmount-after-close-expected.txt [moved from LayoutTests/http/tests/websocket/tests/bufferedAmount-after-close-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/bufferedAmount-after-close.html [moved from LayoutTests/http/tests/websocket/tests/bufferedAmount-after-close.html with 73% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/client-close-expected.txt [moved from LayoutTests/http/tests/websocket/tests/client-close-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/client-close.html [moved from LayoutTests/http/tests/websocket/tests/client-close.html with 71% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/client-close_wsh.py [moved from LayoutTests/http/tests/websocket/tests/client-close_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-before-open-expected.txt [moved from LayoutTests/http/tests/websocket/tests/close-before-open-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-before-open.html [moved from LayoutTests/http/tests/websocket/tests/close-before-open.html with 59% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-event-expected.txt [moved from LayoutTests/http/tests/websocket/tests/close-event-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-event.html [moved from LayoutTests/http/tests/websocket/tests/close-event.html with 75% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-on-navigate-new-location-expected.txt [moved from LayoutTests/http/tests/websocket/tests/close-on-navigate-new-location-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-on-navigate-new-location.html [moved from LayoutTests/http/tests/websocket/tests/close-on-navigate-new-location.html with 76% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload-and-force-gc-expected.txt [moved from LayoutTests/http/tests/websocket/tests/close-on-unload-and-force-gc-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload-and-force-gc.html [moved from LayoutTests/http/tests/websocket/tests/close-on-unload-and-force-gc.html with 81% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload-expected.txt [moved from LayoutTests/http/tests/websocket/tests/close-on-unload-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload-reference-in-parent-expected.txt [moved from LayoutTests/http/tests/websocket/tests/close-on-unload-reference-in-parent-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload-reference-in-parent.html [moved from LayoutTests/http/tests/websocket/tests/close-on-unload-reference-in-parent.html with 79% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload.html [moved from LayoutTests/http/tests/websocket/tests/close-on-unload.html with 76% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-on-unload_wsh.py [moved from LayoutTests/http/tests/websocket/tests/close-on-unload_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-unref-websocket-expected.txt [moved from LayoutTests/http/tests/websocket/tests/close-unref-websocket-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/close-unref-websocket.html [moved from LayoutTests/http/tests/websocket/tests/close-unref-websocket.html with 66% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/cross-origin-expected.txt [moved from LayoutTests/http/tests/websocket/tests/cross-origin-expected.txt with 79% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/cross-origin.html [moved from LayoutTests/http/tests/websocket/tests/cross-origin.html with 75% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/echo-challenge_wsh.py [moved from LayoutTests/http/tests/websocket/tests/echo-challenge_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/echo-cookie_wsh.py [moved from LayoutTests/http/tests/websocket/tests/echo-cookie_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/echo-location_wsh.py [moved from LayoutTests/http/tests/websocket/tests/echo-location_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/echo_wsh.py [moved from LayoutTests/http/tests/websocket/tests/echo_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/error-detect-expected.txt [moved from LayoutTests/http/tests/websocket/tests/error-detect-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/error-detect.html [moved from LayoutTests/http/tests/websocket/tests/error-detect.html with 68% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/fixed-origin_wsh.py [moved from LayoutTests/http/tests/websocket/tests/fixed-origin_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer-expected.txt [moved from LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer.html [moved from LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer.html with 76% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py [moved from LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-overflow-expected.txt [moved from LayoutTests/http/tests/websocket/tests/frame-length-overflow-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-overflow.html [moved from LayoutTests/http/tests/websocket/tests/frame-length-overflow.html with 65% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py [moved from LayoutTests/http/tests/websocket/tests/frame-length-overflow_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-skip-expected.txt [moved from LayoutTests/http/tests/websocket/tests/frame-length-skip-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-skip.html [moved from LayoutTests/http/tests/websocket/tests/frame-length-skip.html with 76% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-length-skip_wsh.py [moved from LayoutTests/http/tests/websocket/tests/frame-length-skip_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-lengths-expected.txt [moved from LayoutTests/http/tests/websocket/tests/frame-lengths-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/frame-lengths.html [moved from LayoutTests/http/tests/websocket/tests/frame-lengths.html with 93% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-challenge-randomness-expected.txt [moved from LayoutTests/http/tests/websocket/tests/handshake-challenge-randomness-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-challenge-randomness.html [moved from LayoutTests/http/tests/websocket/tests/handshake-challenge-randomness.html with 75% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-error-expected.txt [moved from LayoutTests/http/tests/websocket/tests/handshake-error-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-error.html [moved from LayoutTests/http/tests/websocket/tests/handshake-error.html with 72% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-error_wsh.py [moved from LayoutTests/http/tests/websocket/tests/handshake-error_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-cross-origin-expected.txt [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-cross-origin-expected.txt with 85% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-cross-origin.html [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-cross-origin.html with 77% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength-expected.txt [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength.html [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength.html with 77% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header-expected.txt [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header.html [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header.html with 70% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr-expected.txt [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr.html [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr.html with 75% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header-expected.txt [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header.html [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header.html with 70% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null-expected.txt [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null.html [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null.html with 77% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-sub-protocol-mismatch-expected.txt [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/handshake-fail-by-sub-protocol-mismatch.html [moved from LayoutTests/http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch.html with 72% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/hanging-handshake_wsh.py [moved from LayoutTests/http/tests/websocket/tests/hanging-handshake_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/httponly-cookie-expected.txt [moved from LayoutTests/http/tests/websocket/tests/httponly-cookie-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/httponly-cookie.pl [moved from LayoutTests/http/tests/websocket/tests/httponly-cookie.pl with 84% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/long-invalid-header-expected.txt [moved from LayoutTests/http/tests/websocket/tests/long-invalid-header-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/long-invalid-header.html [moved from LayoutTests/http/tests/websocket/tests/long-invalid-header.html with 65% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py [moved from LayoutTests/http/tests/websocket/tests/long-invalid-header_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/multiple-connections-expected.txt [moved from LayoutTests/http/tests/websocket/tests/multiple-connections-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/multiple-connections.html [moved from LayoutTests/http/tests/websocket/tests/multiple-connections.html with 98% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/no-query_wsh.py [moved from LayoutTests/http/tests/websocket/tests/no-query_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/null-character-expected.txt [moved from LayoutTests/http/tests/websocket/tests/null-character-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/null-character.html [moved from LayoutTests/http/tests/websocket/tests/null-character.html with 72% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/origin-test_wsh.py [moved from LayoutTests/http/tests/websocket/tests/origin-test_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/protocol-test_wsh.py [moved from LayoutTests/http/tests/websocket/tests/protocol-test_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/reload-crash-expected.txt [moved from LayoutTests/http/tests/websocket/tests/reload-crash-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/reload-crash.html [moved from LayoutTests/http/tests/websocket/tests/reload-crash.html with 78% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/resources/close-on-unload-iframe-reference-in-parent.html [moved from LayoutTests/http/tests/websocket/tests/resources/close-on-unload-iframe-reference-in-parent.html with 76% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/resources/close-on-unload-iframe.html [moved from LayoutTests/http/tests/websocket/tests/resources/close-on-unload-iframe.html with 67% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html [new file with mode: 0644]
LayoutTests/http/tests/websocket/tests/hixie76/send-after-close-on-unload-expected.txt [moved from LayoutTests/http/tests/websocket/tests/send-after-close-on-unload-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/send-after-close-on-unload.html [moved from LayoutTests/http/tests/websocket/tests/send-after-close-on-unload.html with 80% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/send-expected.txt [moved from LayoutTests/http/tests/websocket/tests/send-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/send-throw-expected.txt [moved from LayoutTests/http/tests/websocket/tests/send-throw-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/send-throw.html [moved from LayoutTests/http/tests/websocket/tests/send-throw.html with 75% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/send.html [moved from LayoutTests/http/tests/websocket/tests/send.html with 81% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/send2_wsh.py [moved from LayoutTests/http/tests/websocket/tests/send2_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/send_wsh.py [moved from LayoutTests/http/tests/websocket/tests/send_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/server-close-expected.txt [moved from LayoutTests/http/tests/websocket/tests/server-close-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/server-close.html [moved from LayoutTests/http/tests/websocket/tests/server-close.html with 66% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/server-close_wsh.py [moved from LayoutTests/http/tests/websocket/tests/server-close_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/simple-expected.txt [moved from LayoutTests/http/tests/websocket/tests/simple-expected.txt with 74% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/simple-stress-expected.txt [moved from LayoutTests/http/tests/websocket/tests/simple-stress-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/simple-stress.html [moved from LayoutTests/http/tests/websocket/tests/simple-stress.html with 94% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/simple.html [moved from LayoutTests/http/tests/websocket/tests/simple.html with 75% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/simple_wsh.py [moved from LayoutTests/http/tests/websocket/tests/simple_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/sub-protocol-expected.txt [moved from LayoutTests/http/tests/websocket/tests/sub-protocol-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/sub-protocol-with-space-expected.txt [moved from LayoutTests/http/tests/websocket/tests/sub-protocol-with-space-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/sub-protocol-with-space.html [moved from LayoutTests/http/tests/websocket/tests/sub-protocol-with-space.html with 72% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/sub-protocol.html [moved from LayoutTests/http/tests/websocket/tests/sub-protocol.html with 72% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/unicode-expected.txt [moved from LayoutTests/http/tests/websocket/tests/unicode-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/unicode.html [moved from LayoutTests/http/tests/websocket/tests/unicode.html with 79% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/unicode_wsh.py [moved from LayoutTests/http/tests/websocket/tests/unicode_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/unknown-frame-type_wsh.py [moved from LayoutTests/http/tests/websocket/tests/unknown-frame-type_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-no-trailing-slash-expected.txt [moved from LayoutTests/http/tests/websocket/tests/url-no-trailing-slash-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-no-trailing-slash.html [moved from LayoutTests/http/tests/websocket/tests/url-no-trailing-slash.html with 79% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-parsing-expected.txt [moved from LayoutTests/http/tests/websocket/tests/url-parsing-expected.txt with 72% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-parsing.html [moved from LayoutTests/http/tests/websocket/tests/url-parsing.html with 67% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-with-credential-expected.txt [moved from LayoutTests/http/tests/websocket/tests/url-with-credential-expected.txt with 54% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-with-credential.html [moved from LayoutTests/http/tests/websocket/tests/url-with-credential.html with 74% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-with-empty-query-expected.txt [moved from LayoutTests/http/tests/websocket/tests/url-with-empty-query-expected.txt with 69% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-with-empty-query.html [moved from LayoutTests/http/tests/websocket/tests/url-with-empty-query.html with 75% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-with-query-expected.txt [moved from LayoutTests/http/tests/websocket/tests/url-with-query-expected.txt with 67% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-with-query-for-no-query-expected.txt [moved from LayoutTests/http/tests/websocket/tests/url-with-query-for-no-query-expected.txt with 70% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-with-query-for-no-query.html [moved from LayoutTests/http/tests/websocket/tests/url-with-query-for-no-query.html with 77% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/url-with-query.html [moved from LayoutTests/http/tests/websocket/tests/url-with-query.html with 75% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/websocket-event-target-expected.txt [moved from LayoutTests/http/tests/websocket/tests/websocket-event-target-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/websocket-event-target.html [moved from LayoutTests/http/tests/websocket/tests/websocket-event-target.html with 86% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/websocket-pending-activity-expected.txt [moved from LayoutTests/http/tests/websocket/tests/websocket-pending-activity-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/websocket-pending-activity.html [moved from LayoutTests/http/tests/websocket/tests/websocket-pending-activity.html with 97% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/websocket-protocol-ignored-expected.txt [moved from LayoutTests/http/tests/websocket/tests/websocket-protocol-ignored-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/websocket-protocol-ignored.html [moved from LayoutTests/http/tests/websocket/tests/websocket-protocol-ignored.html with 73% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash-expected.txt [moved from LayoutTests/http/tests/websocket/tests/workers/close-in-onmessage-crash-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash.html [moved from LayoutTests/http/tests/websocket/tests/workers/close-in-onmessage-crash.html with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/close-in-shared-worker-expected.txt [moved from LayoutTests/http/tests/websocket/tests/workers/close-in-shared-worker-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/close-in-shared-worker.html [moved from LayoutTests/http/tests/websocket/tests/workers/close-in-shared-worker.html with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/close-in-worker-expected.txt [moved from LayoutTests/http/tests/websocket/tests/workers/close-in-worker-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/close-in-worker.html [moved from LayoutTests/http/tests/websocket/tests/workers/close-in-worker.html with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/resources/close-in-onmessage-crash.js [moved from LayoutTests/http/tests/websocket/tests/workers/resources/close-in-onmessage-crash.js with 88% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/resources/close-in-worker.js [moved from LayoutTests/http/tests/websocket/tests/workers/resources/close-in-worker.js with 96% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/resources/echo-challenge_wsh.py [moved from LayoutTests/http/tests/websocket/tests/workers/resources/echo-challenge_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/resources/echo_wsh.py [moved from LayoutTests/http/tests/websocket/tests/workers/resources/echo_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/resources/simple_wsh.py [moved from LayoutTests/http/tests/websocket/tests/workers/resources/simple_wsh.py with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/resources/worker-handshake-challenge-randomness.js [moved from LayoutTests/http/tests/websocket/tests/workers/resources/worker-handshake-challenge-randomness.js with 91% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/resources/worker-simple.js [moved from LayoutTests/http/tests/websocket/tests/workers/resources/worker-simple.js with 96% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/shared-worker-simple-expected.txt [moved from LayoutTests/http/tests/websocket/tests/workers/shared-worker-simple-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/shared-worker-simple.html [moved from LayoutTests/http/tests/websocket/tests/workers/shared-worker-simple.html with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/worker-handshake-challenge-randomness-expected.txt [moved from LayoutTests/http/tests/websocket/tests/workers/worker-handshake-challenge-randomness-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/worker-handshake-challenge-randomness.html [moved from LayoutTests/http/tests/websocket/tests/workers/worker-handshake-challenge-randomness.html with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/worker-simple-expected.txt [moved from LayoutTests/http/tests/websocket/tests/workers/worker-simple-expected.txt with 100% similarity]
LayoutTests/http/tests/websocket/tests/hixie76/workers/worker-simple.html [moved from LayoutTests/http/tests/websocket/tests/workers/worker-simple.html with 100% similarity]
LayoutTests/http/tests/websocket/tests/resources/reload-crash-iframe.html [deleted file]
LayoutTests/platform/chromium-linux/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt [moved from LayoutTests/platform/chromium-linux/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt with 100% similarity]
LayoutTests/platform/chromium-linux/http/tests/websocket/tests/hixie76/url-parsing-expected.txt [moved from LayoutTests/platform/chromium-linux/http/tests/websocket/tests/url-parsing-expected.txt with 73% similarity]
LayoutTests/platform/chromium-mac/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt [moved from LayoutTests/platform/chromium-mac/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt with 100% similarity]
LayoutTests/platform/chromium-mac/http/tests/websocket/tests/hixie76/url-parsing-expected.txt [moved from LayoutTests/platform/chromium-mac/http/tests/websocket/tests/url-parsing-expected.txt with 73% similarity]
LayoutTests/platform/chromium-win/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt [moved from LayoutTests/platform/chromium-win/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt with 100% similarity]
LayoutTests/platform/chromium-win/http/tests/websocket/tests/hixie76/url-parsing-expected.txt [moved from LayoutTests/platform/chromium-win/http/tests/websocket/tests/url-parsing-expected.txt with 72% similarity]
LayoutTests/platform/chromium/test_expectations.txt
LayoutTests/platform/qt-arm/Skipped
LayoutTests/platform/qt-wk2/Skipped
LayoutTests/platform/qt/http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii-expected.txt [moved from LayoutTests/platform/qt/http/tests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt with 100% similarity]
LayoutTests/platform/win/Skipped

index 9233e38..9aeea9c 100644 (file)
@@ -1,3 +1,211 @@
+2011-07-05  Yuta Kitamura  <yutak@chromium.org>
+
+        WebSocket: Move current WebSocket tests to a new directory
+        https://bugs.webkit.org/show_bug.cgi?id=63931
+
+        Reviewed by Kent Tamura.
+
+        In order to put tests for new WebSocket protocol, existing tests for the old protocol
+        need to be moved to a subdirectory (namely "hixie76").
+
+        Minimum changes have been made to tests and test results, such as:
+        - Update links to resource files (e.g. "../../../js-test-pre.js" to "../../../../js-test-pre.js"), and
+        - Update WebSocket URLs in the tests (i.e. adding "hixie76/" to ws:// and wss:// URLs).
+
+        Skipped and test_expectations.txt are also updated accordingly.
+
+        * http/tests/websocket/tests/handler_map.txt:
+        This is the only file left in the current directory. This file defines the handler location
+        to which accesses to the root directory (e.g. "ws://example.com/") are redirected, and
+        cannot be moved.
+        * http/tests/websocket/tests/hixie76/alert-in-event-handler-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/alert-in-event-handler-expected.txt.
+        * http/tests/websocket/tests/hixie76/alert-in-event-handler.html: Renamed from LayoutTests/http/tests/websocket/tests/alert-in-event-handler.html.
+        * http/tests/websocket/tests/hixie76/bad-handshake-crash-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bad-handshake-crash-expected.txt.
+        * http/tests/websocket/tests/hixie76/bad-handshake-crash.html: Renamed from LayoutTests/http/tests/websocket/tests/bad-handshake-crash.html.
+        * http/tests/websocket/tests/hixie76/bad-handshake-crash_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/bad-handshake-crash_wsh.py.
+        * http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
+        * http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars.html: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-control-chars.html.
+        * http/tests/websocket/tests/hixie76/bad-sub-protocol-empty-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-empty-expected.txt.
+        * http/tests/websocket/tests/hixie76/bad-sub-protocol-empty.html: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-empty.html.
+        * http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt.
+        * http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii.html: Renamed from LayoutTests/http/tests/websocket/tests/bad-sub-protocol-non-ascii.html.
+        * http/tests/websocket/tests/hixie76/bufferedAmount-after-close-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/bufferedAmount-after-close-expected.txt.
+        * http/tests/websocket/tests/hixie76/bufferedAmount-after-close.html: Renamed from LayoutTests/http/tests/websocket/tests/bufferedAmount-after-close.html.
+        * http/tests/websocket/tests/hixie76/client-close-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/client-close-expected.txt.
+        * http/tests/websocket/tests/hixie76/client-close.html: Renamed from LayoutTests/http/tests/websocket/tests/client-close.html.
+        * http/tests/websocket/tests/hixie76/client-close_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/client-close_wsh.py.
+        * http/tests/websocket/tests/hixie76/close-before-open-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-before-open-expected.txt.
+        * http/tests/websocket/tests/hixie76/close-before-open.html: Renamed from LayoutTests/http/tests/websocket/tests/close-before-open.html.
+        * http/tests/websocket/tests/hixie76/close-event-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-event-expected.txt.
+        * http/tests/websocket/tests/hixie76/close-event.html: Renamed from LayoutTests/http/tests/websocket/tests/close-event.html.
+        * http/tests/websocket/tests/hixie76/close-on-navigate-new-location-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-on-navigate-new-location-expected.txt.
+        * http/tests/websocket/tests/hixie76/close-on-navigate-new-location.html: Renamed from LayoutTests/http/tests/websocket/tests/close-on-navigate-new-location.html.
+        * http/tests/websocket/tests/hixie76/close-on-unload-and-force-gc-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-and-force-gc-expected.txt.
+        * http/tests/websocket/tests/hixie76/close-on-unload-and-force-gc.html: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-and-force-gc.html.
+        * http/tests/websocket/tests/hixie76/close-on-unload-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-expected.txt.
+        * http/tests/websocket/tests/hixie76/close-on-unload-reference-in-parent-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-reference-in-parent-expected.txt.
+        * http/tests/websocket/tests/hixie76/close-on-unload-reference-in-parent.html: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload-reference-in-parent.html.
+        * http/tests/websocket/tests/hixie76/close-on-unload.html: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload.html.
+        * http/tests/websocket/tests/hixie76/close-on-unload_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/close-on-unload_wsh.py.
+        * http/tests/websocket/tests/hixie76/close-unref-websocket-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/close-unref-websocket-expected.txt.
+        * http/tests/websocket/tests/hixie76/close-unref-websocket.html: Renamed from LayoutTests/http/tests/websocket/tests/close-unref-websocket.html.
+        * http/tests/websocket/tests/hixie76/cross-origin-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/cross-origin-expected.txt.
+        * http/tests/websocket/tests/hixie76/cross-origin.html: Renamed from LayoutTests/http/tests/websocket/tests/cross-origin.html.
+        * http/tests/websocket/tests/hixie76/echo-challenge_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/echo-challenge_wsh.py.
+        * http/tests/websocket/tests/hixie76/echo-cookie_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/echo-cookie_wsh.py.
+        * http/tests/websocket/tests/hixie76/echo-location_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/echo-location_wsh.py.
+        * http/tests/websocket/tests/hixie76/echo_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/echo_wsh.py.
+        * http/tests/websocket/tests/hixie76/error-detect-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/error-detect-expected.txt.
+        * http/tests/websocket/tests/hixie76/error-detect.html: Renamed from LayoutTests/http/tests/websocket/tests/error-detect.html.
+        * http/tests/websocket/tests/hixie76/fixed-origin_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/fixed-origin_wsh.py.
+        * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer-expected.txt.
+        * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer.html: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer.html.
+        * http/tests/websocket/tests/hixie76/frame-length-longer-than-buffer_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-longer-than-buffer_wsh.py.
+        * http/tests/websocket/tests/hixie76/frame-length-overflow-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-overflow-expected.txt.
+        * http/tests/websocket/tests/hixie76/frame-length-overflow.html: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-overflow.html.
+        * http/tests/websocket/tests/hixie76/frame-length-overflow_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-overflow_wsh.py.
+        * http/tests/websocket/tests/hixie76/frame-length-skip-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-skip-expected.txt.
+        * http/tests/websocket/tests/hixie76/frame-length-skip.html: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-skip.html.
+        * http/tests/websocket/tests/hixie76/frame-length-skip_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/frame-length-skip_wsh.py.
+        * http/tests/websocket/tests/hixie76/frame-lengths-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/frame-lengths-expected.txt.
+        * http/tests/websocket/tests/hixie76/frame-lengths.html: Renamed from LayoutTests/http/tests/websocket/tests/frame-lengths.html.
+        * http/tests/websocket/tests/hixie76/handshake-challenge-randomness-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-challenge-randomness-expected.txt.
+        * http/tests/websocket/tests/hixie76/handshake-challenge-randomness.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-challenge-randomness.html.
+        * http/tests/websocket/tests/hixie76/handshake-error-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-error-expected.txt.
+        * http/tests/websocket/tests/hixie76/handshake-error.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-error.html.
+        * http/tests/websocket/tests/hixie76/handshake-error_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-error_wsh.py.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-cross-origin-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-cross-origin-expected.txt.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-cross-origin.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-cross-origin.html.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength-expected.txt.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength.html.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-maxlength_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-maxlength_wsh.py.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header-expected.txt.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header.html.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-connection-header_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-connection-header_wsh.py.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr-expected.txt.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr.html.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-cr_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-cr_wsh.py.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header-expected.txt.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header.html.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-no-upgrade-header_wsh.py.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null-expected.txt.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null.html.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-prepended-null_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-prepended-null_wsh.py.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-sub-protocol-mismatch-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch-expected.txt.
+        * http/tests/websocket/tests/hixie76/handshake-fail-by-sub-protocol-mismatch.html: Renamed from LayoutTests/http/tests/websocket/tests/handshake-fail-by-sub-protocol-mismatch.html.
+        * http/tests/websocket/tests/hixie76/hanging-handshake_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/hanging-handshake_wsh.py.
+        * http/tests/websocket/tests/hixie76/httponly-cookie-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/httponly-cookie-expected.txt.
+        * http/tests/websocket/tests/hixie76/httponly-cookie.pl: Renamed from LayoutTests/http/tests/websocket/tests/httponly-cookie.pl.
+        * http/tests/websocket/tests/hixie76/long-invalid-header-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/long-invalid-header-expected.txt.
+        * http/tests/websocket/tests/hixie76/long-invalid-header.html: Renamed from LayoutTests/http/tests/websocket/tests/long-invalid-header.html.
+        * http/tests/websocket/tests/hixie76/long-invalid-header_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/long-invalid-header_wsh.py.
+        * http/tests/websocket/tests/hixie76/multiple-connections-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/multiple-connections-expected.txt.
+        * http/tests/websocket/tests/hixie76/multiple-connections.html: Renamed from LayoutTests/http/tests/websocket/tests/multiple-connections.html.
+        * http/tests/websocket/tests/hixie76/no-query_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/no-query_wsh.py.
+        * http/tests/websocket/tests/hixie76/null-character-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/null-character-expected.txt.
+        * http/tests/websocket/tests/hixie76/null-character.html: Renamed from LayoutTests/http/tests/websocket/tests/null-character.html.
+        * http/tests/websocket/tests/hixie76/origin-test_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/origin-test_wsh.py.
+        * http/tests/websocket/tests/hixie76/protocol-test_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/protocol-test_wsh.py.
+        * http/tests/websocket/tests/hixie76/reload-crash-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/reload-crash-expected.txt.
+        * http/tests/websocket/tests/hixie76/reload-crash.html: Renamed from LayoutTests/http/tests/websocket/tests/reload-crash.html.
+        * http/tests/websocket/tests/hixie76/resources/close-on-unload-iframe-reference-in-parent.html: Renamed from LayoutTests/http/tests/websocket/tests/resources/close-on-unload-iframe-reference-in-parent.html.
+        * http/tests/websocket/tests/hixie76/resources/close-on-unload-iframe.html: Renamed from LayoutTests/http/tests/websocket/tests/resources/close-on-unload-iframe.html.
+        * http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html: Added.
+        * http/tests/websocket/tests/hixie76/send-after-close-on-unload-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/send-after-close-on-unload-expected.txt.
+        * http/tests/websocket/tests/hixie76/send-after-close-on-unload.html: Renamed from LayoutTests/http/tests/websocket/tests/send-after-close-on-unload.html.
+        * http/tests/websocket/tests/hixie76/send-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/send-expected.txt.
+        * http/tests/websocket/tests/hixie76/send-throw-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/send-throw-expected.txt.
+        * http/tests/websocket/tests/hixie76/send-throw.html: Renamed from LayoutTests/http/tests/websocket/tests/send-throw.html.
+        * http/tests/websocket/tests/hixie76/send.html: Renamed from LayoutTests/http/tests/websocket/tests/send.html.
+        * http/tests/websocket/tests/hixie76/send2_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/send2_wsh.py.
+        * http/tests/websocket/tests/hixie76/send_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/send_wsh.py.
+        * http/tests/websocket/tests/hixie76/server-close-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/server-close-expected.txt.
+        * http/tests/websocket/tests/hixie76/server-close.html: Renamed from LayoutTests/http/tests/websocket/tests/server-close.html.
+        * http/tests/websocket/tests/hixie76/server-close_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/server-close_wsh.py.
+        * http/tests/websocket/tests/hixie76/simple-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/simple-expected.txt.
+        * http/tests/websocket/tests/hixie76/simple-stress-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/simple-stress-expected.txt.
+        * http/tests/websocket/tests/hixie76/simple-stress.html: Renamed from LayoutTests/http/tests/websocket/tests/simple-stress.html.
+        * http/tests/websocket/tests/hixie76/simple.html: Renamed from LayoutTests/http/tests/websocket/tests/simple.html.
+        * http/tests/websocket/tests/hixie76/simple_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/simple_wsh.py.
+        * http/tests/websocket/tests/hixie76/sub-protocol-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/sub-protocol-expected.txt.
+        * http/tests/websocket/tests/hixie76/sub-protocol-with-space-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/sub-protocol-with-space-expected.txt.
+        * http/tests/websocket/tests/hixie76/sub-protocol-with-space.html: Renamed from LayoutTests/http/tests/websocket/tests/sub-protocol-with-space.html.
+        * http/tests/websocket/tests/hixie76/sub-protocol.html: Renamed from LayoutTests/http/tests/websocket/tests/sub-protocol.html.
+        * http/tests/websocket/tests/hixie76/unicode-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/unicode-expected.txt.
+        * http/tests/websocket/tests/hixie76/unicode.html: Renamed from LayoutTests/http/tests/websocket/tests/unicode.html.
+        * http/tests/websocket/tests/hixie76/unicode_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/unicode_wsh.py.
+        * http/tests/websocket/tests/hixie76/unknown-frame-type_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/unknown-frame-type_wsh.py.
+        * http/tests/websocket/tests/hixie76/url-no-trailing-slash-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-no-trailing-slash-expected.txt.
+        * http/tests/websocket/tests/hixie76/url-no-trailing-slash.html: Renamed from LayoutTests/http/tests/websocket/tests/url-no-trailing-slash.html.
+        * http/tests/websocket/tests/hixie76/url-parsing-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-parsing-expected.txt.
+        * http/tests/websocket/tests/hixie76/url-parsing.html: Renamed from LayoutTests/http/tests/websocket/tests/url-parsing.html.
+        * http/tests/websocket/tests/hixie76/url-with-credential-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-with-credential-expected.txt.
+        * http/tests/websocket/tests/hixie76/url-with-credential.html: Renamed from LayoutTests/http/tests/websocket/tests/url-with-credential.html.
+        * http/tests/websocket/tests/hixie76/url-with-empty-query-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-with-empty-query-expected.txt.
+        * http/tests/websocket/tests/hixie76/url-with-empty-query.html: Renamed from LayoutTests/http/tests/websocket/tests/url-with-empty-query.html.
+        * http/tests/websocket/tests/hixie76/url-with-query-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-with-query-expected.txt.
+        * http/tests/websocket/tests/hixie76/url-with-query-for-no-query-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/url-with-query-for-no-query-expected.txt.
+        * http/tests/websocket/tests/hixie76/url-with-query-for-no-query.html: Renamed from LayoutTests/http/tests/websocket/tests/url-with-query-for-no-query.html.
+        * http/tests/websocket/tests/hixie76/url-with-query.html: Renamed from LayoutTests/http/tests/websocket/tests/url-with-query.html.
+        * http/tests/websocket/tests/hixie76/websocket-event-target-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/websocket-event-target-expected.txt.
+        * http/tests/websocket/tests/hixie76/websocket-event-target.html: Renamed from LayoutTests/http/tests/websocket/tests/websocket-event-target.html.
+        * http/tests/websocket/tests/hixie76/websocket-pending-activity-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/websocket-pending-activity-expected.txt.
+        * http/tests/websocket/tests/hixie76/websocket-pending-activity.html: Renamed from LayoutTests/http/tests/websocket/tests/websocket-pending-activity.html.
+        * http/tests/websocket/tests/hixie76/websocket-protocol-ignored-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/websocket-protocol-ignored-expected.txt.
+        * http/tests/websocket/tests/hixie76/websocket-protocol-ignored.html: Renamed from LayoutTests/http/tests/websocket/tests/websocket-protocol-ignored.html.
+        * http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-onmessage-crash-expected.txt.
+        * http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-onmessage-crash.html.
+        * http/tests/websocket/tests/hixie76/workers/close-in-shared-worker-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-shared-worker-expected.txt.
+        * http/tests/websocket/tests/hixie76/workers/close-in-shared-worker.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-shared-worker.html.
+        * http/tests/websocket/tests/hixie76/workers/close-in-worker-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-worker-expected.txt.
+        * http/tests/websocket/tests/hixie76/workers/close-in-worker.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/close-in-worker.html.
+        * http/tests/websocket/tests/hixie76/workers/resources/close-in-onmessage-crash.js: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/close-in-onmessage-crash.js.
+        (runTests.try.ws.onopen):
+        (runTests.try.ws.onmessage):
+        (runTests.try.ws.onclose):
+        (runTests):
+        * http/tests/websocket/tests/hixie76/workers/resources/close-in-worker.js: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/close-in-worker.js.
+        (handleConnect.self.postMessage):
+        (handleConnect):
+        (runTests.try.ws.onopen):
+        (runTests.try.ws.onclose):
+        (runTests):
+        * http/tests/websocket/tests/hixie76/workers/resources/echo-challenge_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/echo-challenge_wsh.py.
+        * http/tests/websocket/tests/hixie76/workers/resources/echo_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/echo_wsh.py.
+        * http/tests/websocket/tests/hixie76/workers/resources/simple_wsh.py: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/simple_wsh.py.
+        * http/tests/websocket/tests/hixie76/workers/resources/worker-handshake-challenge-randomness.js: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/worker-handshake-challenge-randomness.js.
+        (endTest):
+        (runTests.try.ws1.onmessage):
+        (runTests.try.ws1.onclose.ws2.onmessage):
+        (runTests.try.ws1.onclose.ws2.onclose):
+        (runTests.try.ws1.onclose):
+        (runTests):
+        * http/tests/websocket/tests/hixie76/workers/resources/worker-simple.js: Renamed from LayoutTests/http/tests/websocket/tests/workers/resources/worker-simple.js.
+        (handleConnect.self.postMessage):
+        (handleConnect):
+        (runTests.try.ws.onopen):
+        (runTests.try.ws.onmessage):
+        (runTests.try.ws.onclose):
+        (runTests):
+        * http/tests/websocket/tests/hixie76/workers/shared-worker-simple-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/shared-worker-simple-expected.txt.
+        * http/tests/websocket/tests/hixie76/workers/shared-worker-simple.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/shared-worker-simple.html.
+        * http/tests/websocket/tests/hixie76/workers/worker-handshake-challenge-randomness-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/worker-handshake-challenge-randomness-expected.txt.
+        * http/tests/websocket/tests/hixie76/workers/worker-handshake-challenge-randomness.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/worker-handshake-challenge-randomness.html.
+        * http/tests/websocket/tests/hixie76/workers/worker-simple-expected.txt: Renamed from LayoutTests/http/tests/websocket/tests/workers/worker-simple-expected.txt.
+        * http/tests/websocket/tests/hixie76/workers/worker-simple.html: Renamed from LayoutTests/http/tests/websocket/tests/workers/worker-simple.html.
+        * http/tests/websocket/tests/resources/reload-crash-iframe.html: Removed.
+        * platform/chromium-linux/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt: Renamed from LayoutTests/platform/chromium-linux/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
+        * platform/chromium-linux/http/tests/websocket/tests/hixie76/url-parsing-expected.txt: Renamed from LayoutTests/platform/chromium-win/http/tests/websocket/tests/url-parsing-expected.txt.
+        * platform/chromium-mac/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt: Renamed from LayoutTests/platform/chromium-mac/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
+        * platform/chromium-mac/http/tests/websocket/tests/hixie76/url-parsing-expected.txt: Renamed from LayoutTests/platform/chromium-linux/http/tests/websocket/tests/url-parsing-expected.txt.
+        * platform/chromium-win/http/tests/websocket/tests/hixie76/bad-sub-protocol-control-chars-expected.txt: Renamed from LayoutTests/platform/chromium-win/http/tests/websocket/tests/bad-sub-protocol-control-chars-expected.txt.
+        * platform/chromium-win/http/tests/websocket/tests/hixie76/url-parsing-expected.txt: Renamed from LayoutTests/platform/chromium-mac/http/tests/websocket/tests/url-parsing-expected.txt.
+        * platform/chromium/test_expectations.txt:
+        * platform/qt-arm/Skipped:
+        * platform/qt-wk2/Skipped:
+        * platform/qt/http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii-expected.txt: Renamed from LayoutTests/platform/qt/http/tests/websocket/tests/bad-sub-protocol-non-ascii-expected.txt.
+        * platform/win/Skipped:
+
 2011-07-05  Kentaro Hara  <haraken@google.com>
 
         Trigger a 'change' event whenever selected files are changed
index 6649dc8..98fbaa8 100644 (file)
@@ -1,3 +1,3 @@
 # websocket handler map file.
 # request to '/' will be handled by echo-location_wsh.py
-/ /websocket/tests/echo-location
+/ /websocket/tests/hixie76/echo-location
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Make sure event handler called serially.");
 
 window.jsTestIsAsync = true;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/send2");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/send2");
 
 ws.onopen = function()
 {
@@ -38,6 +38,6 @@ alert("waiting for open");
 debug("onopen should fire later.");
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Make sure WebSocket doesn't crash with bad handshake message.");
 
 window.jsTestIsAsync = true;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/bad-handshake-crash");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/bad-handshake-crash");
 ws.onopen = function () {
     debug("WebSocket is open");
 };
@@ -23,6 +23,6 @@ ws.onclose = function () {
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -19,6 +19,6 @@ shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\u001B")');
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -15,6 +15,6 @@ shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "")');
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -22,6 +22,6 @@ shouldThrow('new WebSocket("ws://127.0.0.1:8880/simple", "\uD840\uDC0B")');
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Web Socket bufferedAmount after closed");
 
 window.jsTestIsAsync = true;
 
-var ws = new WebSocket("ws://localhost:8880/websocket/tests/simple");
+var ws = new WebSocket("ws://localhost:8880/websocket/tests/hixie76/simple");
 
 ws.onopen = function()
 {
@@ -35,6 +35,6 @@ ws.onclose = function()
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("WebSocket: Test client-initiated close.");
 
 window.jsTestIsAsync = true;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/client-close");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/client-close");
 var closeEvent;
 var receivedMessage;
 
@@ -39,6 +39,6 @@ ws.onclose = function(event)
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Test if Web Socket fires close event when WebSocket is opened and c
 
 window.jsTestIsAsync = true;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hanging-handshake");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/hanging-handshake");
 ws.onclose = function() {
     debug("closed");
     finishJSTest();
@@ -20,6 +20,6 @@ ws.onclose = function() {
 var successfullyParsed = true;
 ws.close();
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Make sure WebSocket fires CloseEvent when closed.");
 
 window.jsTestIsAsync = true;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple");
 
 ws.onopen = function()
 {
@@ -41,6 +41,6 @@ ws.onclose = function(event)
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -15,7 +15,7 @@ window.jsTestIsAsync = true;
 var frameDiv;
 var closedSocket;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
 ws.onopen = function()
 {
     debug("PASS ws on master document is ready.");
@@ -43,6 +43,6 @@ document.iframeReady = function()
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -25,7 +25,7 @@ function gc()
 var frameDiv;
 var closedSocket;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
 ws.onopen = function()
 {
     debug("PASS ws on master document is ready.");
@@ -54,6 +54,6 @@ document.iframeReady = function()
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -16,7 +16,7 @@ var frameDiv;
 var closedSocket;
 document.childWebSocket = null;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
 ws.onopen = function()
 {
     debug("PASS ws on master document is ready.");
@@ -46,6 +46,6 @@ document.iframeReady = function()
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -15,7 +15,7 @@ window.jsTestIsAsync = true;
 var frameDiv;
 var closedSocket;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
 ws.onopen = function()
 {
     debug("PASS ws on master document is ready.");
@@ -43,6 +43,6 @@ document.iframeReady = function()
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -20,7 +20,7 @@ function endTest()
     finishJSTest();
 };
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hanging-handshake");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/hanging-handshake");
 ws.onclose = function() {
     countCloseEvent += 1;
 };
@@ -30,6 +30,6 @@ gc();
 setTimeout("endTest()", 100);
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -3,7 +3,7 @@ Web Socket Cross Origin test
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 document.domain=127.0.0.1
-ws.url=ws://localhost:8880/websocket/tests/origin-test
+ws.url=ws://localhost:8880/websocket/tests/hixie76/origin-test
 Connected
 PASS origin is "http://127.0.0.1:8000"
 PASS successfullyParsed is true
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -21,7 +21,7 @@ function endTest()
     finishJSTest();
 }
 
-var url = "ws://localhost:8880/websocket/tests/origin-test";
+var url = "ws://localhost:8880/websocket/tests/hixie76/origin-test";
 debug("document.domain=" + document.domain);
 debug("ws.url=" + url);
 var ws = new WebSocket(url);
@@ -52,6 +52,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -14,7 +14,7 @@ window.jsTestIsAsync = true;
 
 var errorCount = 0;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/unknown-frame-type");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/unknown-frame-type");
 ws.onopen = function () {
     debug("WebSocket is open");
 };
@@ -32,6 +32,6 @@ ws.onclose = function () {
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -26,7 +26,7 @@ function finish() {
     finishJSTest();
 }
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/frame-length-longer-than-buffer");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/frame-length-longer-than-buffer");
 ws.onopen = function () {
     debug("WebSocket is open");
 };
@@ -42,6 +42,6 @@ var timeoutID = setTimeout("finish()", 2000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,7 +1,7 @@
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -11,7 +11,7 @@ description("Make sure WebSocket does not crash and report error when it sees le
 
 window.jsTestIsAsync = true;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/frame-length-overflow");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/frame-length-overflow");
 ws.onopen = function () {
     debug("WebSocket is open");
 };
@@ -28,6 +28,6 @@ ws.onclose = function () {
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -26,7 +26,7 @@ function finish() {
     finishJSTest();
 }
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/frame-length-skip");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/frame-length-skip");
 ws.onopen = function () {
     debug("WebSocket is open");
 };
@@ -42,6 +42,6 @@ var timeoutID = setTimeout("finish()", 2000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -15,7 +15,7 @@ function log(message)
     document.getElementById("log").innerHTML += message + "\n";
 }
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/echo");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo");
 
 var lastString;
 var failed = false;
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -15,7 +15,7 @@ window.jsTestIsAsync = true;
 var challenge1;
 var challenge2;
 
-var url = 'ws://localhost:8880/websocket/tests/echo-challenge';
+var url = 'ws://localhost:8880/websocket/tests/hixie76/echo-challenge';
 var ws1 = new WebSocket(url);
 
 ws1.onmessage = function(messageEvent)
@@ -45,6 +45,6 @@ ws1.onclose = function()
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -18,7 +18,7 @@ function endTest()
     finishJSTest();
 }
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/handshake-error");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/handshake-error");
 
 ws.onopen = function()
 {
@@ -47,6 +47,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -4,7 +4,7 @@ Make sure Web Socket connection failed if origin mismatches.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 document.domain=127.0.0.1
-ws.url=ws://localhost:8880/websocket/tests/fixed-origin
+ws.url=ws://localhost:8880/websocket/tests/hixie76/fixed-origin
 PASS connected is false
 PASS origin is undefined.
 PASS successfullyParsed is true
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -23,7 +23,7 @@ function endTest()
     finishJSTest();
 }
 
-var url = "ws://localhost:8880/websocket/tests/fixed-origin";
+var url = "ws://localhost:8880/websocket/tests/hixie76/fixed-origin";
 debug("document.domain=" + document.domain);
 debug("ws.url=" + url);
 var ws = new WebSocket(url);
@@ -56,6 +56,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -24,7 +24,7 @@ function endTest() {
     finishJSTest();
 }
 
-var url = 'ws://localhost:8880/websocket/tests/handshake-fail-by-maxlength';
+var url = 'ws://localhost:8880/websocket/tests/hixie76/handshake-fail-by-maxlength';
 var ws = new WebSocket(url);
 
 ws.onopen = function()
@@ -56,6 +56,6 @@ var timeoutID = setTimeout(timeoutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -18,7 +18,7 @@ function endTest()
     finishJSTest();
 }
 
-var url = "ws://localhost:8880/websocket/tests/handshake-fail-by-no-connection-header";
+var url = "ws://localhost:8880/websocket/tests/hixie76/handshake-fail-by-no-connection-header";
 var ws = new WebSocket(url);
 
 ws.onopen = function()
@@ -47,6 +47,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -22,7 +22,7 @@ function endTest() {
     finishJSTest();
 }
 
-var url = 'ws://localhost:8880/websocket/tests/handshake-fail-by-no-cr';
+var url = 'ws://localhost:8880/websocket/tests/hixie76/handshake-fail-by-no-cr';
 var ws = new WebSocket(url);
 
 ws.onopen = function()
@@ -53,6 +53,6 @@ var timeoutID = setTimeout(timeoutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -18,7 +18,7 @@ function endTest()
     finishJSTest();
 }
 
-var url = "ws://localhost:8880/websocket/tests/handshake-fail-by-no-upgrade-header";
+var url = "ws://localhost:8880/websocket/tests/hixie76/handshake-fail-by-no-upgrade-header";
 var ws = new WebSocket(url);
 
 ws.onopen = function()
@@ -47,6 +47,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -24,7 +24,7 @@ function endTest() {
     finishJSTest();
 }
 
-var url = 'ws://localhost:8880/websocket/tests/handshake-fail-by-prepended-null';
+var url = 'ws://localhost:8880/websocket/tests/hixie76/handshake-fail-by-prepended-null';
 var ws = new WebSocket(url);
 
 ws.onopen = function()
@@ -56,6 +56,6 @@ var timeoutID = setTimeout(timeoutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -21,7 +21,7 @@ function endTest()
     finishJSTest();
 }
 
-var url = "ws://localhost:8880/websocket/tests/protocol-test?protocol=available-protocol";
+var url = "ws://localhost:8880/websocket/tests/hixie76/protocol-test?protocol=available-protocol";
 var ws = new WebSocket(url, "requestting-protocol");
 
 ws.onopen = function()
@@ -50,6 +50,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -8,8 +8,8 @@ print "\r\n";
 print <<HTML
 <html>
 <head>
-<script src="../../../js-test-resources/js-test-pre.js"></script>
-<script src="../../../js-test-resources/js-test-post-function.js"></script>
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
+<script src="../../../../js-test-resources/js-test-post-function.js"></script>
 </head>
 <body>
 <p>Test WebSocket sends HttpOnly cookies.</p>
@@ -39,7 +39,7 @@ function endTest()
        layoutTestController.notifyDone();
 }
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/echo-cookie");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo-cookie");
 ws.onopen = function() {
     debug("WebSocket open");
 };
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -17,7 +17,7 @@ function finish() {
     finishJSTest();
 }
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/long-invalid-header");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/long-invalid-header");
 ws.onopen = function () {
     debug("WebSocket is open");
 };
@@ -29,6 +29,6 @@ var timeoutID = setTimeout("finish()", 2000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -11,7 +11,7 @@ var result = document.getElementById("result");
 var sockets = [];
 
 for (i = 0; i < socketCount; ++i) {
-    var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/echo");
+    var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo");
     sockets[i] = ws;
     ws.onopen = function() {
         var num = parseInt(result.innerHTML);
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Make sure WebSocket transfer null character");
 
 window.jsTestIsAsync = true;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/echo");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo");
 // \xff in string would be \xc3\xbf on websocket connection (UTF-8)
 var expectedMessage = "Should Not\xff\0Split";
 
@@ -39,6 +39,6 @@ ws.onclose = function()
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -34,6 +34,6 @@ debug("PASS insert a iframe");
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,13 +1,13 @@
 <html>
 <head>
-<script src="../../../../js-test-resources/js-test-pre.js"></script>
-<script src="../../../../js-test-resources/js-test-post-function.js"></script>
+<script src="../../../../../js-test-resources/js-test-pre.js"></script>
+<script src="../../../../../js-test-resources/js-test-post-function.js"></script>
 </head>
 <body>
 <div id="description"></div>
 <div id="console"></div>
 <script type="text/javascript">
-parent.document.childWebSocket = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
+parent.document.childWebSocket = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
 
 parent.document.childWebSocket.onopen = function()
 {
@@ -1,13 +1,13 @@
 <html>
 <head>
-<script src="../../../../js-test-resources/js-test-pre.js"></script>
-<script src="../../../../js-test-resources/js-test-post-function.js"></script>
+<script src="../../../../../js-test-resources/js-test-pre.js"></script>
+<script src="../../../../../js-test-resources/js-test-post-function.js"></script>
 </head>
 <body>
 <div id="description"></div>
 <div id="console"></div>
 <script type="text/javascript">
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
 ws.onopen = function()
 {
     // send "socket1" to server, so that "socket1" will be broadcasted to web sockets connected to close-on-unload when this web socket is closed.
diff --git a/LayoutTests/http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html b/LayoutTests/http/tests/websocket/tests/hixie76/resources/reload-crash-iframe.html
new file mode 100644 (file)
index 0000000..18f0e9b
--- /dev/null
@@ -0,0 +1,15 @@
+<html>
+<head>
+<script src="../../../../../js-test-resources/js-test-pre.js"></script>
+<script src="../../../../../js-test-resources/js-test-post-function.js"></script>
+</head>
+<body>
+<div id="description"></div>
+<div id="console"></div>
+<script type="text/javascript">
+parent.document.iframeReady();
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
+location.reload();
+</script>
+</body>
+</html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -16,7 +16,7 @@ var frameDiv;
 var closedSocket;
 document.childWebSocket = null;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/close-on-unload");
 ws.onopen = function()
 {
     debug("PASS ws on master document is ready.");
@@ -47,6 +47,6 @@ document.iframeReady = function()
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -18,7 +18,7 @@ function endTest()
     finishJSTest();
 }
 
-var ws = new WebSocket("ws://localhost:8880/websocket/tests/send");
+var ws = new WebSocket("ws://localhost:8880/websocket/tests/hixie76/send");
 
 var FIRST_MESSAGE_TO_SEND = {
     toString: function() { throw "Pickles"; }
@@ -53,6 +53,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -18,7 +18,7 @@ function endTest()
     finishJSTest();
 }
 
-var ws = new WebSocket("ws://localhost:8880/websocket/tests/send");
+var ws = new WebSocket("ws://localhost:8880/websocket/tests/hixie76/send");
 
 var FIRST_MESSAGE_TO_SEND = "This is the first message to send to the server.";
 var SECOND_MESSAGE_TO_SEND = "This is the second.";
@@ -60,6 +60,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("WebSocket: Test server-initiated close.");
 
 window.jsTestIsAsync = true;
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/server-close");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/server-close");
 var closeEvent;
 
 ws.onopen = function()
@@ -35,6 +35,6 @@ ws.onclose = function(event)
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -2,7 +2,7 @@ Simple Web Socket test
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-Created a socket to 'ws://127.0.0.1:8880/websocket/tests/simple'; readyState 0.
+Created a socket to 'ws://127.0.0.1:8880/websocket/tests/hixie76/simple'; readyState 0.
 Connected; readyState 1
 Received: 'Hello from Simple WSH.'; readyState 1
 Closed; readyState 3.
@@ -15,7 +15,7 @@ function log(message)
     document.getElementById("log").innerHTML += message + "\n";
 }
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/echo");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo");
 
 ws.onopen = function() {
     for (i = 0; i < numSmallMessages; ++i) {
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -18,7 +18,7 @@ function endTest()
     finishJSTest();
 }
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple");
 debug("Created a socket to '" + ws.URL + "'; readyState " + ws.readyState + ".");
 
 ws.onopen = function()
@@ -47,6 +47,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -20,7 +20,7 @@ function endTest()
     finishJSTest();
 }
 
-var url = "ws://localhost:8880/websocket/tests/protocol-test?protocol=sub%20protocol";
+var url = "ws://localhost:8880/websocket/tests/hixie76/protocol-test?protocol=sub%20protocol";
 var ws = new WebSocket(url, "sub protocol");
 
 ws.onopen = function()
@@ -49,6 +49,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -20,7 +20,7 @@ function endTest()
     finishJSTest();
 }
 
-var url = "ws://localhost:8880/websocket/tests/protocol-test?protocol=sub-protocol";
+var url = "ws://localhost:8880/websocket/tests/hixie76/protocol-test?protocol=sub-protocol";
 var ws = new WebSocket(url, "sub-protocol");
 
 ws.onopen = function()
@@ -49,6 +49,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -18,7 +18,7 @@ function endTest()
     finishJSTest();
 }
 
-var ws = new WebSocket("ws://localhost:8880/websocket/tests/unicode");
+var ws = new WebSocket("ws://localhost:8880/websocket/tests/hixie76/unicode");
 
 // Hello in Japanese
 var UNICODE_HELLO = "\u3053\u3093\u306b\u3061\u306f";
@@ -58,6 +58,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -35,6 +35,6 @@ ws.onclose = function () {
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -12,9 +12,9 @@ PASS new WebSocket("ws://javascript:a") threw exception Error: SYNTAX_ERR: DOM E
 PASS new WebSocket("/applet") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("ws://127.0.0.1:25/") threw exception Error: SECURITY_ERR: DOM Exception 18.
-PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/simple"
-PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?"
-PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?k=v"
+PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/hixie76/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple?"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v"
 PASS new WebSocket("ws://127.0.0.1/path#") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("ws://127.0.0.1/path#fragment") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS successfullyParsed is true
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -24,9 +24,9 @@ shouldThrow('new WebSocket("ws://127.0.0.1:25/")');
 
 // Resolve the url string using the resolve a Web address algorithm.
 // Use 127.0.0.1:8880 and existing ws handler to make sure we don't receive unexpected response (so no console message appears)
-shouldBe('(new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/simple")).URL', '"ws://127.0.0.1:8880/websocket/tests/simple"');
-shouldBe('(new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?")).URL', '"ws://127.0.0.1:8880/websocket/tests/simple?"');
-shouldBe('(new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?k=v")).URL', '"ws://127.0.0.1:8880/websocket/tests/simple?k=v"');
+shouldBe('(new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/hixie76/simple")).URL', '"ws://127.0.0.1:8880/websocket/tests/hixie76/simple"');
+shouldBe('(new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?")).URL', '"ws://127.0.0.1:8880/websocket/tests/hixie76/simple?"');
+shouldBe('(new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v")).URL', '"ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v"');
 
 // draft-hixie-thewebsocketprotocol-60 says If /url/ has a <fragment>
 // component, then fail the parsing Web Socket URLs, so throw a SYNTAX_ERR
@@ -36,6 +36,6 @@ shouldThrow('new WebSocket("ws://127.0.0.1/path#fragment")');
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -2,12 +2,12 @@ Make sure handshake with URL with credentail info success.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-url=ws://user:pass@127.0.0.1:8880/websocket/tests/echo-location
+url=ws://user:pass@127.0.0.1:8880/websocket/tests/hixie76/echo-location
 WebSocket is open
-received:ws://127.0.0.1:8880/websocket/tests/echo-location
+received:ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location
 WebSocket is closed
 PASS handshake_success is true
-PASS ws_location is "ws://127.0.0.1:8880/websocket/tests/echo-location"
+PASS ws_location is "ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location"
 PASS successfullyParsed is true
 
 TEST COMPLETE
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Make sure handshake with URL with credentail info success.");
 
 window.jsTestIsAsync = true;
 
-var url = "ws://user:pass@127.0.0.1:8880/websocket/tests/echo-location";
+var url = "ws://user:pass@127.0.0.1:8880/websocket/tests/hixie76/echo-location";
 var handshake_success = false;
 var ws_location;
 
@@ -20,7 +20,7 @@ function endTest()
 {
     clearTimeout(timeoutID);
     shouldBeTrue("handshake_success");
-    shouldBe("ws_location", '"ws://127.0.0.1:8880/websocket/tests/echo-location"');
+    shouldBe("ws_location", '"ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location"');
     finishJSTest();
 }
 
@@ -43,6 +43,6 @@ var timeoutID = setTimeout("endTest()", 2000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -2,9 +2,9 @@ Make sure handshake with URL with empty query components success.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-url=ws://127.0.0.1:8880/websocket/tests/echo-location?
+url=ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location?
 WebSocket is open
-received:ws://127.0.0.1:8880/websocket/tests/echo-location?
+received:ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location?
 WebSocket is closed
 PASS handshake_success is true
 PASS ws_location is url
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Make sure handshake with URL with empty query components success.")
 
 window.jsTestIsAsync = true;
 
-var url = "ws://127.0.0.1:8880/websocket/tests/echo-location?";
+var url = "ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location?";
 var handshake_success = false;
 var ws_location;
 
@@ -43,6 +43,6 @@ var timeoutID = setTimeout("endTest()", 2000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -2,9 +2,9 @@ Make sure handshake with URL with query components success.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-url=ws://127.0.0.1:8880/websocket/tests/echo-location?q=v
+url=ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location?q=v
 WebSocket is open
-received:ws://127.0.0.1:8880/websocket/tests/echo-location?q=v
+received:ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location?q=v
 WebSocket is closed
 PASS handshake_success is true
 PASS ws_location is url
@@ -1,9 +1,9 @@
-CONSOLE MESSAGE: line 0: Error during WebSocket handshake: location mismatch: ws://127.0.0.1:8880/websocket/tests/no-query? != /websocket/tests/no-query
+CONSOLE MESSAGE: line 0: Error during WebSocket handshake: location mismatch: ws://127.0.0.1:8880/websocket/tests/hixie76/no-query? != /websocket/tests/hixie76/no-query
 Make sure handshake with URL with query components fails against server that doesn't support query component.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
-url=ws://127.0.0.1:8880/websocket/tests/no-query?
+url=ws://127.0.0.1:8880/websocket/tests/hixie76/no-query?
 WebSocket is closed
 PASS handshake_success is false
 PASS ws_location is undefined.
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Make sure handshake with URL with query components fails against se
 
 window.jsTestIsAsync = true;
 
-var url = "ws://127.0.0.1:8880/websocket/tests/no-query?";
+var url = "ws://127.0.0.1:8880/websocket/tests/hixie76/no-query?";
 var handshake_success = false;
 var ws_location;
 
@@ -43,6 +43,6 @@ var timeoutID = setTimeout("endTest()", 2000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -12,7 +12,7 @@ description("Make sure handshake with URL with query components success.");
 
 window.jsTestIsAsync = true;
 
-var url = "ws://127.0.0.1:8880/websocket/tests/echo-location?q=v";
+var url = "ws://127.0.0.1:8880/websocket/tests/hixie76/echo-location?q=v";
 var handshake_success = false;
 var ws_location;
 
@@ -43,6 +43,6 @@ var timeoutID = setTimeout("endTest()", 2000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -10,7 +10,7 @@
 <script type="text/javascript">
 description("Make sure WebSocket object acts as EventTarget.");
 
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple");
+var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple");
 ws.close(); // That is not a test with a WebSocket server, prevent logging an error to console.
 var open_event_handled = false;
 var message_event_handled = false;
@@ -64,6 +64,6 @@ shouldBe("close_event_handled", "false");
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -18,7 +18,7 @@ function gc()
 
 function test()
 {
-    var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/echo");
+    var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/echo");
     ws.onopen = function() {
         this.send("PASS");
     }
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
 <head>
-<link rel="stylesheet" href="../../../js-test-resources/js-test-style.css">
-<script src="../../../js-test-resources/js-test-pre.js"></script>
+<link rel="stylesheet" href="../../../../js-test-resources/js-test-style.css">
+<script src="../../../../js-test-resources/js-test-pre.js"></script>
 </head>
 <body>
 <div id="description"></div>
@@ -21,7 +21,7 @@ function endTest()
     finishJSTest();
 }
 
-var url = "ws://localhost:8880/websocket/tests/protocol-test?protocol=sub-protocol";
+var url = "ws://localhost:8880/websocket/tests/hixie76/protocol-test?protocol=sub-protocol";
 var ws = new WebSocket(url);
 
 ws.onopen = function()
@@ -50,6 +50,6 @@ var timeoutID = setTimeout(timeOutCallback, 3000);
 
 var successfullyParsed = true;
 </script>
-<script src="../../../js-test-resources/js-test-post.js"></script>
+<script src="../../../../js-test-resources/js-test-post.js"></script>
 </body>
 </html>
@@ -1,7 +1,7 @@
 function runTests()
 {
     try {
-        var url = 'ws://localhost:8880/websocket/tests/workers/resources/simple';
+        var url = 'ws://localhost:8880/websocket/tests/hixie76/workers/resources/simple';
         var ws = new WebSocket(url);
 
         ws.onopen = function()
@@ -19,7 +19,7 @@ function runTests()
             postMessage("PASS: worker: WebSocket exists");
         else
             postMessage("FAIL: worker: no WebSocket");
-        ws = new WebSocket('ws://localhost:8880/websocket/tests/workers/resources/echo');
+        ws = new WebSocket('ws://localhost:8880/websocket/tests/hixie76/workers/resources/echo');
         ws.onopen = function() {
             postMessage("PASS: worker: Connected.");
             ws.close();
@@ -14,7 +14,7 @@ function endTest()
 function runTests()
 {
     try {
-        var url = 'ws://localhost:8880/websocket/tests/workers/resources/echo-challenge';
+        var url = 'ws://localhost:8880/websocket/tests/hixie76/workers/resources/echo-challenge';
         var ws1 = new WebSocket(url);
 
         ws1.onmessage = function(messageEvent)
@@ -19,7 +19,7 @@ function runTests()
             postMessage("PASS: worker: WebSocket exists");
         else
             postMessage("PASS: worker: no WebSocket");
-        ws = new WebSocket('ws://localhost:8880/websocket/tests/workers/resources/simple');
+        ws = new WebSocket('ws://localhost:8880/websocket/tests/hixie76/workers/resources/simple');
         ws.onopen = function() {
             postMessage("PASS: worker: Connected.");
         };
diff --git a/LayoutTests/http/tests/websocket/tests/resources/reload-crash-iframe.html b/LayoutTests/http/tests/websocket/tests/resources/reload-crash-iframe.html
deleted file mode 100644 (file)
index 5107da0..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head>
-<script src="../../../../js-test-resources/js-test-pre.js"></script>
-<script src="../../../../js-test-resources/js-test-post-function.js"></script>
-</head>
-<body>
-<div id="description"></div>
-<div id="console"></div>
-<script type="text/javascript">
-parent.document.iframeReady();
-var ws = new WebSocket("ws://127.0.0.1:8880/websocket/tests/close-on-unload");
-location.reload();
-</script>
-</body>
-</html>
@@ -12,9 +12,9 @@ PASS new WebSocket("ws://javascript:a") threw exception Error: SYNTAX_ERR: DOM E
 PASS new WebSocket("/applet") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("ws://127.0.0.1:25/") threw exception Error: SECURITY_ERR: DOM Exception 18.
-PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/simple"
-PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?"
-PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?k=v"
+PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/hixie76/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple?"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v"
 PASS new WebSocket("ws://127.0.0.1/path#") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("ws://127.0.0.1/path#fragment") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS successfullyParsed is true
@@ -12,9 +12,9 @@ PASS new WebSocket("ws://javascript:a") threw exception Error: SYNTAX_ERR: DOM E
 PASS new WebSocket("/applet") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("ws://127.0.0.1:25/") threw exception Error: SECURITY_ERR: DOM Exception 18.
-PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/simple"
-PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?"
-PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?k=v"
+PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/hixie76/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple?"
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v"
 PASS new WebSocket("ws://127.0.0.1/path#") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS new WebSocket("ws://127.0.0.1/path#fragment") threw exception Error: SYNTAX_ERR: DOM Exception 12.
 PASS successfullyParsed is true
@@ -12,9 +12,9 @@ PASS new WebSocket("ws://javascript:a") threw exception Error: SYNTAX_ERR: DOM E
 PASS new WebSocket("/applet") threw exception Error: SYNTAX_ERR: DOM Exception 12.\r
 PASS new WebSocket("javascript:a") threw exception Error: SYNTAX_ERR: DOM Exception 12.\r
 PASS new WebSocket("ws://127.0.0.1:25/") threw exception Error: SECURITY_ERR: DOM Exception 18.\r
-PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/simple"\r
-PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?"\r
-PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/simple?k=v"\r
+PASS (new WebSocket("ws://127.0.0.1:8880/a/../websocket/tests/hixie76/simple")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple"\r
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple?"\r
+PASS (new WebSocket("ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v")).URL is "ws://127.0.0.1:8880/websocket/tests/hixie76/simple?k=v"\r
 PASS new WebSocket("ws://127.0.0.1/path#") threw exception Error: SYNTAX_ERR: DOM Exception 12.\r
 PASS new WebSocket("ws://127.0.0.1/path#fragment") threw exception Error: SYNTAX_ERR: DOM Exception 12.\r
 PASS successfullyParsed is true\r
index a176088..63efa86 100644 (file)
@@ -100,7 +100,7 @@ BUGCR18702 WIN : http/tests/xmlhttprequest/supported-xml-content-types.html = PA
 
 BUGCR36539 SLOW : http/tests/misc/uncacheable-script-repeated.html = PASS
 
-BUGCR32018 SLOW : http/tests/websocket/tests/frame-lengths.html = PASS
+BUGCR32018 SLOW : http/tests/websocket/tests/hixie76/frame-lengths.html = PASS
 BUGCR69513 DEBUG SLOW : html5lib/webkit-resumer.html = PASS
 
 BUGCR75226 WIN SLOW : http/tests/cache/subresource-expiration-1.html = PASS
@@ -159,7 +159,7 @@ WONTFIX SKIP : http/tests/filesystem/workers = PASS TIMEOUT FAIL
 WONTFIX SKIP : http/tests/workers = PASS TIMEOUT FAIL
 WONTFIX SKIP : http/tests/xmlhttprequest/workers = PASS TIMEOUT FAIL
 WONTFIX SKIP : http/tests/eventsource/workers = PASS TIMEOUT FAIL
-WONTFIX SKIP : http/tests/websocket/tests/workers/ = PASS TIMEOUT FAIL
+WONTFIX SKIP : http/tests/websocket/tests/hixie76/workers/ = PASS TIMEOUT FAIL
 WONTFIX SKIP : inspector/debugger/script-formatter.html = PASS TIMEOUT FAIL
 
 // Page Cache - based tests. Chromium disables page cache because the WebKit page cache keeps previously
@@ -1829,7 +1829,7 @@ BUGCR31252 : http/tests/security/listener/xss-inactive-closure.html = TEXT
 BUGCR31623 WIN: http/tests/appcache/remove-cache.html = PASS TEXT TIMEOUT
 
 // WebKit roll 52852 -> 52867
-BUGCR32018 DEBUG : http/tests/websocket/tests/simple-stress.html = PASS TEXT TIMEOUT
+BUGCR32018 DEBUG : http/tests/websocket/tests/hixie76/simple-stress.html = PASS TEXT TIMEOUT
 
 // V8's implementation of getOwnPropertyNames has different results for built-in
 // functions.
@@ -2976,7 +2976,7 @@ BUGWK54499 LINUX : svg/transforms/text-with-pattern-with-svg-transform.svg = IMA
 BUGCR73080 LINUX DEBUG : fast/forms/form-attribute-elements-order.html = PASS TIMEOUT
 BUGCR73091 : animations/play-state-suspend.html = PASS TEXT
 BUGCR73092 WIN : fast/dom/gc-11.html = PASS TEXT
-BUGCR73094 LINUX : http/tests/websocket/tests/send-after-close-on-unload.html = PASS TIMEOUT
+BUGCR73094 LINUX : http/tests/websocket/tests/hixie76/send-after-close-on-unload.html = PASS TIMEOUT
 
 BUGV8_1168 : fast/js/mozilla/eval/exhaustive-fun-normalcaller-indirect-strictcode.html = TEXT
 BUGV8_1168 : fast/js/mozilla/eval/exhaustive-fun-strictcaller-indirect-strictcode.html = TEXT
@@ -3839,7 +3839,7 @@ BUGWK61664 LINUX : svg/zoom/page/relative-sized-document-scrollbars.svg = IMAGE
 
 BUGCR84317 DEBUG : svg/wicd/test-scalable-background-image1.xhtml = CRASH
 
-BUGWK61767 WIN DEBUG : http/tests/websocket/tests/client-close.html = PASS TEXT
+BUGWK61767 WIN DEBUG : http/tests/websocket/tests/hixie76/client-close.html = PASS TEXT
 
 BUGWK59782 WIN LINUX DEBUG : svg/dynamic-updates/SVGFEDropShadowElement-dom-dx-attr.html = TIMEOUT
 BUGWK59782 WIN LINUX DEBUG : svg/dynamic-updates/SVGFEDropShadowElement-dom-dy-attr.html = TIMEOUT
index 3f9c703..a8fa58d 100644 (file)
@@ -12,11 +12,11 @@ http/tests/inspector/resource-tree/resource-tree-reload.html
 http/tests/navigation/forward-and-cancel.html
 http/tests/security/cross-frame-access-put.html
 http/tests/security/mixedContent/insecure-plugin-in-iframe.html
-http/tests/websocket/tests/close-before-open.html
-http/tests/websocket/tests/close-unref-websocket.html
-http/tests/websocket/tests/frame-lengths.html
-http/tests/websocket/tests/simple-stress.html
-http/tests/websocket/tests/websocket-event-target.html
+http/tests/websocket/tests/hixie76/close-before-open.html
+http/tests/websocket/tests/hixie76/close-unref-websocket.html
+http/tests/websocket/tests/hixie76/frame-lengths.html
+http/tests/websocket/tests/hixie76/simple-stress.html
+http/tests/websocket/tests/hixie76/websocket-event-target.html
 jquery/manipulation.html
 platform/qt/plugins/qt-qwidget-plugin.html
 plugins/application-plugin-plugins-disabled.html
index 217c6a3..b98902f 100644 (file)
@@ -223,7 +223,7 @@ fast/text/format-control.html
 fast/text/zero-width-characters.html
 fast/url/anchor.html
 fast/url/path.html
-http/tests/websocket/tests/bad-sub-protocol-non-ascii.html
+http/tests/websocket/tests/hixie76/bad-sub-protocol-non-ascii.html
 
 # EventSender.mouseMoveTo is not yet supported
 svg/dynamic-updates
@@ -264,7 +264,7 @@ storage/read-transactions-running-concurrently.html
 http/tests/appcache
 fast/dom/beforeload/video-before-load.html
 media/video-source-moved.html
-http/tests/websocket/tests/frame-lengths.html
+http/tests/websocket/tests/hixie76/frame-lengths.html
 http/tests/misc/object-image-error.html
 http/tests/security/contentSecurityPolicy/media-src-allowed.html
 
index ada37c0..ecbc9bd 100644 (file)
@@ -386,7 +386,7 @@ http/tests/media/video-cancel-load.html
 http/tests/media/video-cross-site.html
 
 # Sometimes crashes http://webkit.org/b/48996
-http/tests/websocket/tests/workers/close-in-onmessage-crash.html
+http/tests/websocket/tests/hixie76/workers/close-in-onmessage-crash.html
 
 # Sometimes times out http://webkit.org/b/48997
 animations/animation-iteration-event-destroy-renderer.html
@@ -908,8 +908,8 @@ media/video-display-aspect-ratio.html
 http/tests/misc/image-checks-for-accept.html
 
 # Tests timeout: https://bugs.webkit.org/show_bug.cgi?id=35041
-http/tests/websocket/tests/frame-lengths.html
-http/tests/websocket/tests/simple-stress.html
+http/tests/websocket/tests/hixie76/frame-lengths.html
+http/tests/websocket/tests/hixie76/simple-stress.html
 
 # Needs platform specific API implemented in DRT, maybe not relevant for non-Mac and non-Windows ports
 fast/loader/api-test-new-window-data-load-base-url.html