Index: Tools/Scripts/webkitpy/layout_tests/servers/server_base.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py b/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py |
index 1d6a3e1138acf6b5700861b71c0977076879dba1..0914b6e37b5581213d78b742d05a4c7b2290f1cf 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py |
@@ -72,8 +72,10 @@ class ServerBase(object): |
# Subclasses may override these fields. |
self._env = None |
+ self._cwd = None |
self._stdout = self._executive.PIPE |
self._stderr = self._executive.PIPE |
+ self._keep_process_reference = False |
self._process = None |
Dirk Pranke
2015/06/15 23:41:48
This seems a bit off; we actually define a self._p
burnik
2015/06/16 09:24:34
Done. Hope it doesn't break anything...
|
self._pid = None |
self._error_log_path = None |
@@ -162,7 +164,14 @@ class ServerBase(object): |
def _spawn_process(self): |
_log.debug('Starting %s server, cmd="%s"' % (self._name, self._start_cmd)) |
- process = self._executive.popen(self._start_cmd, env=self._env, stdout=self._stdout, stderr=self._stderr) |
+ process = self._executive.popen(self._start_cmd, |
+ env=self._env, |
+ cwd=self._cwd, |
+ stdout=self._stdout, |
+ stderr=self._stderr) |
+ if self._keep_process_reference: |
+ self._process = process |
+ |
pid = process.pid |
self._filesystem.write_text_file(self._pid_file, str(pid)) |
return pid |