OLD | NEW |
---|---|
1 # Copyright (C) 2011 Google Inc. All rights reserved. | 1 # Copyright (C) 2011 Google Inc. All rights reserved. |
2 # | 2 # |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following disclaimer | 10 # copyright notice, this list of conditions and the following disclaimer |
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
55 executable = self._port_obj.path_to_apache() | 55 executable = self._port_obj.path_to_apache() |
56 server_root = self._filesystem.dirname(self._filesystem.dirname(executab le)) | 56 server_root = self._filesystem.dirname(self._filesystem.dirname(executab le)) |
57 | 57 |
58 test_dir = self._port_obj.layout_tests_dir() | 58 test_dir = self._port_obj.layout_tests_dir() |
59 document_root = self._filesystem.join(test_dir, "http", "tests") | 59 document_root = self._filesystem.join(test_dir, "http", "tests") |
60 forms_test_resources_dir = self._filesystem.join(test_dir, "fast", "form s", "resources") | 60 forms_test_resources_dir = self._filesystem.join(test_dir, "fast", "form s", "resources") |
61 imported_resources_dir = self._filesystem.join(test_dir, "imported", "wp t", "resources") | 61 imported_resources_dir = self._filesystem.join(test_dir, "imported", "wp t", "resources") |
62 media_resources_dir = self._filesystem.join(test_dir, "media") | 62 media_resources_dir = self._filesystem.join(test_dir, "media") |
63 mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime. types") | 63 mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime. types") |
64 cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-http d.pem") | 64 cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-http d.pem") |
65 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
| |
65 inspector_sources_dir = self._port_obj.inspector_build_directory() | 66 inspector_sources_dir = self._port_obj.inspector_build_directory() |
66 | 67 |
67 self._access_log_path = self._filesystem.join(output_dir, "access_log.tx t") | 68 self._access_log_path = self._filesystem.join(output_dir, "access_log.tx t") |
68 self._error_log_path = self._filesystem.join(output_dir, "error_log.txt" ) | 69 self._error_log_path = self._filesystem.join(output_dir, "error_log.txt" ) |
69 | 70 |
70 self._is_win = self._port_obj.host.platform.is_win() | 71 self._is_win = self._port_obj.host.platform.is_win() |
71 | 72 |
72 start_cmd = [ | 73 start_cmd = [ |
73 executable, | 74 executable, |
74 '-f', '%s' % self._port_obj.path_to_apache_config_file(), | 75 '-f', '%s' % self._port_obj.path_to_apache_config_file(), |
75 '-C', 'ServerRoot "%s"' % server_root, | 76 '-C', 'ServerRoot "%s"' % server_root, |
76 '-C', 'DocumentRoot "%s"' % document_root, | 77 '-C', 'DocumentRoot "%s"' % document_root, |
77 '-c', 'AliasMatch /(.*/)?js-test-resources/(.+) "%s/$1resources/$2"' % test_dir, | 78 '-c', 'AliasMatch /(.*/)?js-test-resources/(.+) "%s/$1resources/$2"' % test_dir, |
78 '-c', 'AliasMatch ^/resources/testharness([r.].*) "%s/testharness$1" ' % imported_resources_dir, | 79 '-c', 'AliasMatch ^/resources/testharness([r.].*) "%s/testharness$1" ' % imported_resources_dir, |
80 '-c', 'Alias /resources/mojo-helpers.js "%s/mojo-helpers.js"' % reso urces_dir, | |
79 '-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2. js"' % imported_resources_dir, | 81 '-c', 'Alias /w3c/resources/WebIDLParser.js "%s/webidl2/lib/webidl2. js"' % imported_resources_dir, |
80 '-c', 'Alias /w3c/resources "%s"' % imported_resources_dir, | 82 '-c', 'Alias /w3c/resources "%s"' % imported_resources_dir, |
81 '-c', 'Alias /forms-test-resources "%s"' % forms_test_resources_dir, | 83 '-c', 'Alias /forms-test-resources "%s"' % forms_test_resources_dir, |
82 '-c', 'Alias /media-resources "%s"' % media_resources_dir, | 84 '-c', 'Alias /media-resources "%s"' % media_resources_dir, |
83 '-c', 'TypesConfig "%s"' % mime_types_path, | 85 '-c', 'TypesConfig "%s"' % mime_types_path, |
84 '-c', 'CustomLog "%s" common' % self._access_log_path, | 86 '-c', 'CustomLog "%s" common' % self._access_log_path, |
85 '-c', 'ErrorLog "%s"' % self._error_log_path, | 87 '-c', 'ErrorLog "%s"' % self._error_log_path, |
86 '-c', 'PidFile %s' % self._pid_file, | 88 '-c', 'PidFile %s' % self._pid_file, |
87 '-c', 'SSLCertificateFile "%s"' % cert_file, | 89 '-c', 'SSLCertificateFile "%s"' % cert_file, |
88 '-c', 'Alias /inspector-sources "%s"' % inspector_sources_dir, | 90 '-c', 'Alias /inspector-sources "%s"' % inspector_sources_dir, |
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
169 retval = proc.returncode | 171 retval = proc.returncode |
170 err = proc.stderr.read() | 172 err = proc.stderr.read() |
171 if retval or len(err): | 173 if retval or len(err): |
172 raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err)) | 174 raise server_base.ServerError('Failed to stop %s: %s' % (self._name, err)) |
173 | 175 |
174 # For some reason apache isn't guaranteed to have actually stopped after | 176 # For some reason apache isn't guaranteed to have actually stopped after |
175 # the stop command returns, so we wait a little while longer for the | 177 # the stop command returns, so we wait a little while longer for the |
176 # pid file to be removed. | 178 # pid file to be removed. |
177 if not self._wait_for_action(lambda: not self._filesystem.exists(self._p id_file)): | 179 if not self._wait_for_action(lambda: not self._filesystem.exists(self._p id_file)): |
178 raise server_base.ServerError('Failed to stop %s: pid file still exi sts' % self._name) | 180 raise server_base.ServerError('Failed to stop %s: pid file still exi sts' % self._name) |
OLD | NEW |