| 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 401 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 412 | 412 |
| 413 def _command_from_driver_input(self, driver_input): | 413 def _command_from_driver_input(self, driver_input): |
| 414 # FIXME: performance tests pass in full URLs instead of test names. | 414 # FIXME: performance tests pass in full URLs instead of test names. |
| 415 if driver_input.test_name.startswith( | 415 if driver_input.test_name.startswith( |
| 416 'http://') or driver_input.test_name.startswith('https://') or d
river_input.test_name == ('about:blank'): | 416 'http://') or driver_input.test_name.startswith('https://') or d
river_input.test_name == ('about:blank'): |
| 417 command = driver_input.test_name | 417 command = driver_input.test_name |
| 418 elif self.is_http_test(driver_input.test_name) or self._port.should_use_
wptserve(driver_input.test_name): | 418 elif self.is_http_test(driver_input.test_name) or self._port.should_use_
wptserve(driver_input.test_name): |
| 419 command = self.test_to_uri(driver_input.test_name) | 419 command = self.test_to_uri(driver_input.test_name) |
| 420 else: | 420 else: |
| 421 command = self._port.abspath_for_test(driver_input.test_name) | 421 command = self._port.abspath_for_test(driver_input.test_name) |
| 422 if sys.platform == 'cygwin': | |
| 423 command = path.cygpath(command) | |
| 424 | 422 |
| 425 assert not driver_input.image_hash or driver_input.should_run_pixel_test | 423 assert not driver_input.image_hash or driver_input.should_run_pixel_test |
| 426 | 424 |
| 427 # ' is the separator between arguments. | 425 # ' is the separator between arguments. |
| 428 if self._port.supports_per_test_timeout(): | 426 if self._port.supports_per_test_timeout(): |
| 429 command += "'--timeout'%s" % driver_input.timeout | 427 command += "'--timeout'%s" % driver_input.timeout |
| 430 if driver_input.should_run_pixel_test: | 428 if driver_input.should_run_pixel_test: |
| 431 command += "'--pixel-test" | 429 command += "'--pixel-test" |
| 432 if driver_input.image_hash: | 430 if driver_input.image_hash: |
| 433 command += "'" + driver_input.image_hash | 431 command += "'" + driver_input.image_hash |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 546 self.decoded_content = None | 544 self.decoded_content = None |
| 547 self.malloc = None | 545 self.malloc = None |
| 548 self.js_heap = None | 546 self.js_heap = None |
| 549 self.stdin_path = None | 547 self.stdin_path = None |
| 550 | 548 |
| 551 def decode_content(self): | 549 def decode_content(self): |
| 552 if self.encoding == 'base64' and self.content is not None: | 550 if self.encoding == 'base64' and self.content is not None: |
| 553 self.decoded_content = base64.b64decode(self.content) | 551 self.decoded_content = base64.b64decode(self.content) |
| 554 else: | 552 else: |
| 555 self.decoded_content = self.content | 553 self.decoded_content = self.content |
| OLD | NEW |