Index: Tools/Scripts/webkitpy/layout_tests/port/driver.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/driver.py b/Tools/Scripts/webkitpy/layout_tests/port/driver.py |
index fda859e39504a2768fd9c4f1d080e9113edb698a..c625134d6ace54a16b6fb668229fa31d65e6b286 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/port/driver.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/port/driver.py |
@@ -150,7 +150,8 @@ class Driver(object): |
Returns a DriverOutput object. |
""" |
start_time = time.time() |
- self.start(driver_input.should_run_pixel_test, driver_input.args) |
+ stdin_deadline = start_time + int(driver_input.timeout) / 2000.0 |
+ self.start(driver_input.should_run_pixel_test, driver_input.args, stdin_deadline) |
test_begin_time = time.time() |
self.error_from_test = str() |
self.err_seen_eof = False |
@@ -265,7 +266,7 @@ class Driver(object): |
return True |
return False |
- def start(self, pixel_tests, per_test_args): |
+ def start(self, pixel_tests, per_test_args, deadline): |
new_cmd_line = self.cmd_line(pixel_tests, per_test_args) |
if not self._server_process or new_cmd_line != self._current_cmd_line: |
self._start(pixel_tests, per_test_args) |
@@ -430,7 +431,8 @@ class Driver(object): |
or self._read_header(block, line, 'Content-Length: ', '_content_length', int) |
or self._read_header(block, line, 'ActualHash: ', 'content_hash') |
or self._read_header(block, line, 'DumpMalloc: ', 'malloc') |
- or self._read_header(block, line, 'DumpJSHeap: ', 'js_heap')): |
+ or self._read_header(block, line, 'DumpJSHeap: ', 'js_heap') |
+ or self._read_header(block, line, 'StdinPath', 'stdin_path')): |
return |
# Note, we're not reading ExpectedHash: here, but we could. |
# If the line wasn't a header, we just append it to the content. |
@@ -507,6 +509,7 @@ class ContentBlock(object): |
self.decoded_content = None |
self.malloc = None |
self.js_heap = None |
+ self.stdin_path = None |
def decode_content(self): |
if self.encoding == 'base64' and self.content is not None: |