| 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) | 59 self._pid_file = self._filesystem.join(self._runtime_path, '%s.pid' % se
lf._name) |
| 60 | 60 |
| 61 if self._port: | 61 if self._port: |
| 62 self._port = int(self._port) | 62 self._port = int(self._port) |
| 63 | 63 |
| 64 if not self._layout_tests_dir: | 64 if not self._layout_tests_dir: |
| 65 self._layout_tests_dir = self._port_obj.layout_tests_dir() | 65 self._layout_tests_dir = self._port_obj.layout_tests_dir() |
| 66 | 66 |
| 67 self._webkit_tests = os.path.join(self._layout_tests_dir, 'http', 'tests
') | 67 self._webkit_tests = os.path.join(self._layout_tests_dir, 'http', 'tests
') |
| 68 self._js_test_resource = os.path.join(self._layout_tests_dir, 'fast', 'j
s', 'resources') | 68 self._js_test_resource = os.path.join(self._layout_tests_dir, 'resources
') |
| 69 self._media_resource = os.path.join(self._layout_tests_dir, 'media') | 69 self._media_resource = os.path.join(self._layout_tests_dir, 'media') |
| 70 | 70 |
| 71 # Self generated certificate for SSL server (for client cert get | 71 # Self generated certificate for SSL server (for client cert get |
| 72 # <base-path>\chrome\test\data\ssl\certs\root_ca_cert.crt) | 72 # <base-path>\chrome\test\data\ssl\certs\root_ca_cert.crt) |
| 73 self._pem_file = os.path.join( | 73 self._pem_file = os.path.join( |
| 74 os.path.dirname(os.path.abspath(__file__)), 'httpd2.pem') | 74 os.path.dirname(os.path.abspath(__file__)), 'httpd2.pem') |
| 75 | 75 |
| 76 # One mapping where we can get to everything | 76 # One mapping where we can get to everything |
| 77 self.VIRTUALCONFIG = [] | 77 self.VIRTUALCONFIG = [] |
| 78 | 78 |
| (...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 219 # FIXME: https://bugs.webkit.org/show_bug.cgi?id=106838 | 219 # FIXME: https://bugs.webkit.org/show_bug.cgi?id=106838 |
| 220 # We need to kill all of the child processes as well as the | 220 # We need to kill all of the child processes as well as the |
| 221 # parent, so we can't use executive.kill_process(). | 221 # parent, so we can't use executive.kill_process(). |
| 222 # | 222 # |
| 223 # If this is actually working, we should figure out a clean API. | 223 # If this is actually working, we should figure out a clean API. |
| 224 self._executive.run_command(["taskkill.exe", "/f", "/t", "/pid",
self._pid], error_handler=self._executive.ignore_error) | 224 self._executive.run_command(["taskkill.exe", "/f", "/t", "/pid",
self._pid], error_handler=self._executive.ignore_error) |
| 225 else: | 225 else: |
| 226 self._executive.kill_process(self._pid) | 226 self._executive.kill_process(self._pid) |
| 227 return False | 227 return False |
| 228 return True | 228 return True |
| OLD | NEW |