Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Unified Diff: sky/tools/webkitpy/layout_tests/servers/apache_http.py

Issue 687673004: Move framework/inspector/server to services/inspector (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « sky/tools/sky_server ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/tools/webkitpy/layout_tests/servers/apache_http.py
diff --git a/sky/tools/webkitpy/layout_tests/servers/apache_http.py b/sky/tools/webkitpy/layout_tests/servers/apache_http.py
index 82767d02dbb6e5a4f0e3dbbe8139267b1b8bedb0..203ce1509493f07374bc731a64f65018e4318e8e 100644
--- a/sky/tools/webkitpy/layout_tests/servers/apache_http.py
+++ b/sky/tools/webkitpy/layout_tests/servers/apache_http.py
@@ -60,6 +60,8 @@ class ApacheHTTP(server_base.ServerBase):
self._filesystem.abspath(port_obj.gen_dir()), "mojo")
sky_gen_dir = self._filesystem.join(
self._filesystem.abspath(port_obj.gen_dir()), "sky")
+ sky_framework_dir = self._filesystem.join(
+ self._filesystem.abspath(port_obj.path_from_chromium_base("sky", "framework")))
js_test_resources_dir = self._filesystem.join(test_dir, "resources")
media_resources_dir = self._filesystem.join(test_dir, "media")
mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.types")
@@ -75,6 +77,7 @@ class ApacheHTTP(server_base.ServerBase):
'-C', 'ServerRoot "%s"' % server_root,
'-C', 'DocumentRoot "%s"' % test_dir,
'-c', 'Alias /mojo "%s"' % mojo_gen_dir,
+ '-c', 'Alias /sky/framework "%s"' % sky_framework_dir,
'-c', 'Alias /sky "%s"' % sky_gen_dir,
'-c', 'Alias /js-test-resources "%s"' % js_test_resources_dir,
'-c', 'Alias /media-resources "%s"' % media_resources_dir,
« no previous file with comments | « sky/tools/sky_server ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698