third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py - Issue 2511333002: Cleanup after enabling WPTServe.

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/apache_http.py

Issue 2511333002: Cleanup after enabling WPTServe. (Closed)

Patch Set: rebase Created 3 years, 11 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

« content/shell/renderer/layout_test/blink_test_runner.cc ('K') | « third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py » ('j') | third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py » ('J')
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 238c3f9e3c5c81f70c4fdb94d11141ef26164bde..ad41719362b7c6722999090c8040568b677f690e 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

@@ -75,9 +75,9 @@ class ApacheHTTP(server_base.ServerBase):

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

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

'-c', 'AliasMatch /(.*/)?js-test-resources/(.+) "%s/$1resources/$2"' % test_dir,

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

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

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

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

qyearsley 2017/01/19 18:00:33 I'm not sure about the correctness of this, since

tkent 2017/01/19 23:49:59 Yes and yes.

qyearsley 2017/01/20 00:04:46 Alright :-)

+ '-c', 'Alias /w3c/resources "%s/resources"' % test_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,