| OLD | NEW |
| 1 # Copyright (C) 2012 Google Inc. All rights reserved. | 1 # Copyright (C) 2012 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 597 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 608 exists = True | 608 exists = True |
| 609 break | 609 break |
| 610 if not exists: | 610 if not exists: |
| 611 _log.error('You are missing %s under %s. Try installing %s. See
build instructions.', | 611 _log.error('You are missing %s under %s. Try installing %s. See
build instructions.', |
| 612 font_file, font_dirs, package) | 612 font_file, font_dirs, package) |
| 613 return test_run_results.SYS_DEPS_EXIT_STATUS | 613 return test_run_results.SYS_DEPS_EXIT_STATUS |
| 614 return test_run_results.OK_EXIT_STATUS | 614 return test_run_results.OK_EXIT_STATUS |
| 615 | 615 |
| 616 def requires_http_server(self): | 616 def requires_http_server(self): |
| 617 """Chromium Android runs tests on devices, and uses the HTTP server to | 617 """Chromium Android runs tests on devices, and uses the HTTP server to |
| 618 serve the actual layout tests to the test driver.""" | 618 serve the actual layout tests to the test driver. |
| 619 """ |
| 619 return True | 620 return True |
| 620 | 621 |
| 621 def start_http_server(self, additional_dirs, number_of_drivers): | 622 def start_http_server(self, additional_dirs, number_of_drivers): |
| 622 additional_dirs[PERF_TEST_PATH_PREFIX] = self.perf_tests_dir() | 623 additional_dirs[PERF_TEST_PATH_PREFIX] = self.perf_tests_dir() |
| 623 additional_dirs[LAYOUT_TEST_PATH_PREFIX] = self.layout_tests_dir() | 624 additional_dirs[LAYOUT_TEST_PATH_PREFIX] = self.layout_tests_dir() |
| 624 super(AndroidPort, self).start_http_server(additional_dirs, number_of_dr
ivers) | 625 super(AndroidPort, self).start_http_server(additional_dirs, number_of_dr
ivers) |
| 625 | 626 |
| 626 def create_driver(self, worker_number, no_timeout=False): | 627 def create_driver(self, worker_number, no_timeout=False): |
| 627 return ChromiumAndroidDriver(self, worker_number, pixel_tests=self.get_o
ption('pixel_tests'), | 628 return ChromiumAndroidDriver(self, worker_number, pixel_tests=self.get_o
ption('pixel_tests'), |
| 628 driver_details=self._driver_details, | 629 driver_details=self._driver_details, |
| (...skipping 678 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1307 return command | 1308 return command |
| 1308 | 1309 |
| 1309 def _read_prompt(self, deadline): | 1310 def _read_prompt(self, deadline): |
| 1310 last_char = '' | 1311 last_char = '' |
| 1311 while True: | 1312 while True: |
| 1312 current_char = self._server_process.read_stdout(deadline, 1) | 1313 current_char = self._server_process.read_stdout(deadline, 1) |
| 1313 if current_char == ' ': | 1314 if current_char == ' ': |
| 1314 if last_char in ('#', '$'): | 1315 if last_char in ('#', '$'): |
| 1315 return | 1316 return |
| 1316 last_char = current_char | 1317 last_char = current_char |
| OLD | NEW |