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 f58e7ecc547708f5dd5fea82106a7d0e77887f87..f7a2272207cc49f48890873f9706a3a9b7aaebd2 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 |
@@ -62,6 +62,7 @@ class ApacheHTTP(server_base.ServerBase): |
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") |
+ resources_dir = self._filesystem.join(test_dir, "resources") |
johnme
2016/08/17 13:54:02
What's the difference between this and imported_re
harkness
2016/08/18 10:23:26
This was actually a change I got from Peter. Origi
johnme
2016/08/18 13:04:31
How does http/tests/security/powerfulFeatureRestri
harkness
2016/08/22 08:57:47
Ah, it looks like they added test_dir to make it a
|
inspector_sources_dir = self._port_obj.inspector_build_directory() |
self._access_log_path = self._filesystem.join(output_dir, "access_log.txt") |
@@ -76,6 +77,7 @@ class ApacheHTTP(server_base.ServerBase): |
'-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', 'Alias /resources/mojo-helpers.js "%s/mojo-helpers.js"' % resources_dir, |
'-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2.js"' % imported_resources_dir, |
'-c', 'Alias /w3c/resources "%s"' % imported_resources_dir, |
'-c', 'Alias /forms-test-resources "%s"' % forms_test_resources_dir, |