webkit/tools/layout_tests/layout_package/path_utils.py - Issue 339019: Change the document root for the test Web Socket server to WebKit/LayoutTests...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webkit/tools/layout_tests/layout_package/path_utils.py

Issue 339019: Change the document root for the test Web Socket server to WebKit/LayoutTests... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/

Patch Set: Created 11 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: webkit/tools/layout_tests/layout_package/path_utils.py

===================================================================

--- webkit/tools/layout_tests/layout_package/path_utils.py (revision 30163)

+++ webkit/tools/layout_tests/layout_package/path_utils.py (working copy)

@@ -181,6 +181,7 @@

def FilenameToUri(full_path):

"""Convert a test file to a URI."""

+ LAYOUTTESTS_DIR = "LayoutTests/"

LAYOUTTEST_HTTP_DIR = "LayoutTests/http/tests/"

PENDING_HTTP_DIR = "pending/http/tests/"

LAYOUTTEST_WEBSOCKET_DIR = "LayoutTests/websocket/tests/"

@@ -198,8 +199,9 @@

relative_path = relative_path[len(PENDING_HTTP_DIR):]

port = 9000

elif relative_path.startswith(LAYOUTTEST_WEBSOCKET_DIR):

- # LayoutTests/websocket/tests/ run off port 8880

- relative_path = relative_path[len(LAYOUTTEST_WEBSOCKET_DIR):]

+ # LayoutTests/websocket/tests/ run off port 8880 and 9323

+ # Note: the root is LayoutTests/, not LayoutTests/websocket/tests/

+ relative_path = relative_path[len(LAYOUTTESTS_DIR):]

port = 8880

elif relative_path.find("/http/") >= 0:

# chrome/http/tests run off of port 8081 with the full path

« no previous file with comments | « no previous file | webkit/tools/layout_tests/layout_package/websocket_server.py » ('j') | no next file with comments »