| 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 53 self._name = 'httpd' | 53 self._name = 'httpd' |
| 54 self._mappings = [{'port': 8000}, | 54 self._mappings = [{'port': 8000}, |
| 55 {'port': 8080}, | 55 {'port': 8080}, |
| 56 {'port': 8443, 'sslcert': True}] | 56 {'port': 8443, 'sslcert': True}] |
| 57 self._output_dir = output_dir | 57 self._output_dir = output_dir |
| 58 self._filesystem.maybe_make_directory(output_dir) | 58 self._filesystem.maybe_make_directory(output_dir) |
| 59 | 59 |
| 60 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) | 60 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) |
| 61 | 61 |
| 62 test_dir = self._port_obj.layout_tests_dir() | 62 test_dir = self._port_obj.layout_tests_dir() |
| 63 js_test_resources_dir = self._filesystem.join(test_dir, "fast", "js", "r
esources") | 63 js_test_resources_dir = self._filesystem.join(test_dir, "resources") |
| 64 media_resources_dir = self._filesystem.join(test_dir, "media") | 64 media_resources_dir = self._filesystem.join(test_dir, "media") |
| 65 mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.
types") | 65 mime_types_path = self._filesystem.join(test_dir, "http", "conf", "mime.
types") |
| 66 cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-http
d.pem") | 66 cert_file = self._filesystem.join(test_dir, "http", "conf", "webkit-http
d.pem") |
| 67 access_log = self._filesystem.join(output_dir, "access_log.txt") | 67 access_log = self._filesystem.join(output_dir, "access_log.txt") |
| 68 error_log = self._filesystem.join(output_dir, "error_log.txt") | 68 error_log = self._filesystem.join(output_dir, "error_log.txt") |
| 69 document_root = self._filesystem.join(test_dir, "http", "tests") | 69 document_root = self._filesystem.join(test_dir, "http", "tests") |
| 70 | 70 |
| 71 # FIXME: We shouldn't be calling a protected method of _port_obj! | 71 # FIXME: We shouldn't be calling a protected method of _port_obj! |
| 72 executable = self._port_obj._path_to_apache() | 72 executable = self._port_obj._path_to_apache() |
| 73 | 73 |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 # the sake of Window/Cygwin and it needs quoting that breaks | 183 # the sake of Window/Cygwin and it needs quoting that breaks |
| 184 # shell=False. | 184 # shell=False. |
| 185 # FIXME: We should not need to be joining shell arguments into strings. | 185 # FIXME: We should not need to be joining shell arguments into strings. |
| 186 # shell=True is a trail of tears. | 186 # shell=True is a trail of tears. |
| 187 # Note: Not thread safe: http://bugs.python.org/issue2320 | 187 # Note: Not thread safe: http://bugs.python.org/issue2320 |
| 188 process = self._executive.popen(cmd, shell=True, stderr=self._executive.
PIPE) | 188 process = self._executive.popen(cmd, shell=True, stderr=self._executive.
PIPE) |
| 189 process.wait() | 189 process.wait() |
| 190 retval = process.returncode | 190 retval = process.returncode |
| 191 err = process.stderr.read() | 191 err = process.stderr.read() |
| 192 return (retval, err) | 192 return (retval, err) |
| OLD | NEW |