diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-24 11:24:40 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-06-02 09:53:15 +0100 |
| commit | 81bc750723a18f21cd17d1b173cd2a4dda9cea6e (patch) | |
| tree | 7a9e5ed86ff429fd347a25153107221543909b19 /Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py | |
| parent | 94088a6d336c1dd80a1e734af51e96abcbb689a7 (diff) | |
| download | external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.zip external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.gz external_webkit-81bc750723a18f21cd17d1b173cd2a4dda9cea6e.tar.bz2 | |
Merge WebKit at r80534: Intial merge by Git
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
Diffstat (limited to 'Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py')
| -rw-r--r-- | Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py b/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py index 46617f6..05a2338 100644 --- a/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py +++ b/Tools/Scripts/webkitpy/layout_tests/port/apache_http_server.py @@ -75,6 +75,7 @@ class LayoutTestApacheHttpd(http_server_base.HttpServerBase): test_dir = self._port_obj.layout_tests_dir() js_test_resources_dir = self._cygwin_safe_join(test_dir, "fast", "js", "resources") + media_resources_dir = self._cygwin_safe_join(test_dir, "media") mime_types_path = self._cygwin_safe_join(test_dir, "http", "conf", "mime.types") cert_file = self._cygwin_safe_join(test_dir, "http", "conf", @@ -92,6 +93,7 @@ class LayoutTestApacheHttpd(http_server_base.HttpServerBase): '-f', "\"%s\"" % self._get_apache_config_file_path(test_dir, output_dir), '-C', "\'DocumentRoot \"%s\"\'" % document_root, '-c', "\'Alias /js-test-resources \"%s\"'" % js_test_resources_dir, + '-c', "\'Alias /media-resources \"%s\"'" % media_resources_dir, '-C', "\'Listen %s\'" % "127.0.0.1:8000", '-C', "\'Listen %s\'" % "127.0.0.1:8081", '-c', "\'TypesConfig \"%s\"\'" % mime_types_path, @@ -194,6 +196,7 @@ class LayoutTestApacheHttpd(http_server_base.HttpServerBase): # FIXME: We should not need to be joining shell arguments into strings. # shell=True is a trail of tears. # Note: Not thread safe: http://bugs.python.org/issue2320 + _log.debug('Starting http server, cmd="%s"' % str(self._start_cmd)) self._httpd_proc = subprocess.Popen(self._start_cmd, stderr=subprocess.PIPE, shell=True) |