Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py - Issue 1154373005: Introduce WPTServe for running W3C Blink Layout tests

Side by Side Diff

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

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

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/servers/pywebsocket.py

Issue 1154373005: Introduce WPTServe for running W3C Blink Layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Add executable bit to pass permchecks. Created 5 years, 6 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 unified diff | Download patch

OLD	NEW
1 # Copyright (C) 2011 Google Inc. All rights reserved.	1 # Copyright (C) 2011 Google Inc. All rights reserved.

2 #	2 #

3 # Redistribution and use in source and binary forms, with or without	3 # Redistribution and use in source and binary forms, with or without

4 # modification, are permitted provided that the following conditions are	4 # modification, are permitted provided that the following conditions are

5 # met:	5 # met:

6 #	6 #

7 # * Redistributions of source code must retain the above copyright	7 # * Redistributions of source code must retain the above copyright

8 # notice, this list of conditions and the following disclaimer.	8 # notice, this list of conditions and the following disclaimer.

9 # * Redistributions in binary form must reproduce the above	9 # * Redistributions in binary form must reproduce the above

10 # copyright notice, this list of conditions and the following disclaimer	10 # copyright notice, this list of conditions and the following disclaimer

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 self._start_cmd = [	65 self._start_cmd = [

66 sys.executable, '-u', pywebsocket_script,	66 sys.executable, '-u', pywebsocket_script,

67 '--server-host', 'localhost',	67 '--server-host', 'localhost',

68 '--port', str(self._port),	68 '--port', str(self._port),

69 '--document-root', self._web_socket_tests,	69 '--document-root', self._web_socket_tests,

70 '--scan-dir', self._web_socket_tests,	70 '--scan-dir', self._web_socket_tests,

71 '--cgi-paths', '/',	71 '--cgi-paths', '/',

72 '--log-file', self._error_log,	72 '--log-file', self._error_log,

73 '--websock-handlers-map-file', self._filesystem.join(self._web_socke t_tests, 'handler_map.txt'),	73 '--websock-handlers-map-file', self._filesystem.join(self._web_socke t_tests, 'handler_map.txt'),

74 ]	74 ]

	75 # TODO(burnik): Check if this is really needed (and why). If not, just s et PYTHONPATH.

75 self._env = self._port_obj.setup_environ_for_server()	76 self._env = self._port_obj.setup_environ_for_server()

76 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get ('PYTHONPATH', ''))	77 self._env['PYTHONPATH'] = (pywebsocket_base + os.pathsep + self._env.get ('PYTHONPATH', ''))

OLD	NEW