| 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 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 class DumpRenderTreeDriverDetails(SharedDriverDetails): | 157 class DumpRenderTreeDriverDetails(SharedDriverDetails): |
| 158 def apk_name(self): | 158 def apk_name(self): |
| 159 return 'DumpRenderTree_apk/DumpRenderTree-debug.apk' | 159 return 'DumpRenderTree_apk/DumpRenderTree-debug.apk' |
| 160 def package_name(self): | 160 def package_name(self): |
| 161 return 'org.chromium.native_test' | 161 return 'org.chromium.native_test' |
| 162 def activity_name(self): | 162 def activity_name(self): |
| 163 return self.package_name() + '/.ChromeNativeTestActivity' | 163 return self.package_name() + '/.ChromeNativeTestActivity' |
| 164 def library_name(self): | 164 def library_name(self): |
| 165 return 'libDumpRenderTree.so' | 165 return 'libDumpRenderTree.so' |
| 166 def additional_resources(self): | 166 def additional_resources(self): |
| 167 return ['DumpRenderTree.pak', 'DumpRenderTree_resources'] | 167 return [] |
| 168 def command_line_file(self): | 168 def command_line_file(self): |
| 169 return '/data/local/tmp/chrome-native-tests-command-line' | 169 return '/data/local/tmp/chrome-native-tests-command-line' |
| 170 def additional_command_line_flags(self): | 170 def additional_command_line_flags(self): |
| 171 return ['--create-stdin-fifo', '--separate-stderr-fifo', '--disable-impl
-side-painting'] | 171 return ['--create-stdin-fifo', '--separate-stderr-fifo', '--disable-impl
-side-painting'] |
| 172 def device_directory(self): | 172 def device_directory(self): |
| 173 return DEVICE_SOURCE_ROOT_DIR + 'drt/' | 173 return DEVICE_SOURCE_ROOT_DIR + 'drt/' |
| 174 | 174 |
| 175 # Information required when running layout tests using content_shell as the test
runner. | 175 # Information required when running layout tests using content_shell as the test
runner. |
| 176 class ContentShellDriverDetails(SharedDriverDetails): | 176 class ContentShellDriverDetails(SharedDriverDetails): |
| 177 def apk_name(self): | 177 def apk_name(self): |
| (...skipping 844 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1022 return command | 1022 return command |
| 1023 | 1023 |
| 1024 def _read_prompt(self, deadline): | 1024 def _read_prompt(self, deadline): |
| 1025 last_char = '' | 1025 last_char = '' |
| 1026 while True: | 1026 while True: |
| 1027 current_char = self._server_process.read_stdout(deadline, 1) | 1027 current_char = self._server_process.read_stdout(deadline, 1) |
| 1028 if current_char == ' ': | 1028 if current_char == ' ': |
| 1029 if last_char in ('#', '$'): | 1029 if last_char in ('#', '$'): |
| 1030 return | 1030 return |
| 1031 last_char = current_char | 1031 last_char = current_char |
| OLD | NEW |