third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py - Issue 2454323004: Make layout test harness extensible with custom layout tests directory

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: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

Issue 2454323004: Make layout test harness extensible with custom layout tests directory (Closed)

Patch Set: Undo non test harness changes Created 4 years, 1 month 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: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

index c6e238e9dbd174dfeb3628da451c0185563cf788..d2a658a9103c53e3c82db6c79220dae01a8a10b7 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

@@ -60,8 +60,8 @@ class ApacheHTTP(server_base.ServerBase):

forms_test_resources_dir = self._filesystem.join(test_dir, "fast", "forms", "resources")

imported_resources_dir = self._filesystem.join(test_dir, "imported", "wpt", "resources")

media_resources_dir = self._filesystem.join(test_dir, "media")

- mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.types")

- cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-httpd.pem")

+ mime_types_path = self._filesystem.join(self._port_obj.apache_config_directory(), "mime.types")

+ cert_file = self._filesystem.join(self._port_obj.apache_config_directory(), "webkit-httpd.pem")

inspector_sources_dir = self._port_obj.inspector_build_directory()

inspector_debug_dir = self._port_obj.inspector_debug_directory()

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py ('k') | no next file » | no next file with comments »