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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
325 | 325 |
326 if self._driver_tempdir: | 326 if self._driver_tempdir: |
327 self._port._filesystem.rmtree(str(self._driver_tempdir)) | 327 self._port._filesystem.rmtree(str(self._driver_tempdir)) |
328 self._driver_tempdir = None | 328 self._driver_tempdir = None |
329 | 329 |
330 self._current_cmd_line = None | 330 self._current_cmd_line = None |
331 | 331 |
332 def cmd_line(self, pixel_tests, per_test_args): | 332 def cmd_line(self, pixel_tests, per_test_args): |
333 cmd = self._command_wrapper(self._port.get_option('wrapper')) | 333 cmd = self._command_wrapper(self._port.get_option('wrapper')) |
334 cmd.append(self._port._path_to_driver()) | 334 cmd.append(self._port._path_to_driver()) |
335 if self._port.get_option('gc_between_tests'): | |
336 cmd.append('--gc-between-tests') | |
337 if self._port.get_option('complex_text'): | |
338 cmd.append('--complex-text') | |
339 if self._port.get_option('threaded'): | |
340 cmd.append('--threaded') | |
341 if self._no_timeout: | 335 if self._no_timeout: |
342 cmd.append('--no-timeout') | 336 cmd.append('--no-timeout') |
343 # FIXME: We need to pass --timeout=SECONDS to WebKitTestRunner for WebKi
t2. | 337 # FIXME: We need to pass --timeout=SECONDS to WebKitTestRunner for WebKi
t2. |
344 | 338 |
345 cmd.extend(self._port.get_option('additional_drt_flag', [])) | 339 cmd.extend(self._port.get_option('additional_drt_flag', [])) |
346 cmd.extend(self._port.additional_drt_flag()) | 340 cmd.extend(self._port.additional_drt_flag()) |
347 | 341 |
348 cmd.extend(per_test_args) | 342 cmd.extend(per_test_args) |
349 | 343 |
350 cmd.append('-') | 344 cmd.append('-') |
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 self.content = str() # FIXME: Should be bytearray() once we require Pyt
hon 2.6. | 490 self.content = str() # FIXME: Should be bytearray() once we require Pyt
hon 2.6. |
497 self.decoded_content = None | 491 self.decoded_content = None |
498 self.malloc = None | 492 self.malloc = None |
499 self.js_heap = None | 493 self.js_heap = None |
500 | 494 |
501 def decode_content(self): | 495 def decode_content(self): |
502 if self.encoding == 'base64' and self.content is not None: | 496 if self.encoding == 'base64' and self.content is not None: |
503 self.decoded_content = base64.b64decode(self.content) | 497 self.decoded_content = base64.b64decode(self.content) |
504 else: | 498 else: |
505 self.decoded_content = self.content | 499 self.decoded_content = self.content |
OLD | NEW |