third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py - Issue 1898703003: Remove testharness.js and friends in LayoutTests/http/tests/.

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 1898703003: Remove testharness.js and friends in LayoutTests/http/tests/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« third_party/WebKit/LayoutTests/http/tests/local/serviceworker/fetch-request-body-file.html ('K') | « third_party/WebKit/LayoutTests/http/tests/w3c/resources/testharnessreport.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 134880bc247d2d7d590e40a0bd950938c0edbbeb..59b676cd4e0a62e097e1e909b6105e833d4410a3 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,6 +60,7 @@ class ApacheHTTP(server_base.ServerBase):

document_root = self._filesystem.join(test_dir, "http", "tests")

js_test_resources_dir = self._filesystem.join(test_dir, "resources")

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

+ imported_resources_dir = self._filesystem.join(test_dir, "imported", "web-platform-tests", "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")

@@ -76,6 +77,9 @@ class ApacheHTTP(server_base.ServerBase):

'-C', 'ServerRoot "%s"' % server_root,

'-C', 'DocumentRoot "%s"' % document_root,

'-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir,

+ '-c', 'AliasMatch ^/resources/testharness([r.].*) "%s/testharness$1"' % imported_resources_dir,

+ '-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2.js"' % imported_resources_dir,

jsbell 2016/04/18 17:39:46 WebIDLParser.js is automagically made available he

Dirk Pranke 2016/04/18 17:44:31 Ah, right.

+ '-c', 'Alias /w3c/resources "%s"' % imported_resources_dir,

'-c', 'Alias /forms-test-resources "%s"' % forms_test_resources_dir,

'-c', 'Alias /media-resources "%s"' % media_resources_dir,

'-c', 'TypesConfig "%s"' % mime_types_path,