Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(116)

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py

Issue 14969031: Fix regression of fast/block/basic crash on android (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix regression of fast/block/basic crash on android Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 return 'org.chromium.native_test' 160 return 'org.chromium.native_test'
161 def activity_name(self): 161 def activity_name(self):
162 return self.package_name() + '/.ChromeNativeTestActivity' 162 return self.package_name() + '/.ChromeNativeTestActivity'
163 def library_name(self): 163 def library_name(self):
164 return 'libDumpRenderTree.so' 164 return 'libDumpRenderTree.so'
165 def additional_resources(self): 165 def additional_resources(self):
166 return ['DumpRenderTree.pak', 'DumpRenderTree_resources'] 166 return ['DumpRenderTree.pak', 'DumpRenderTree_resources']
167 def command_line_file(self): 167 def command_line_file(self):
168 return '/data/local/tmp/chrome-native-tests-command-line' 168 return '/data/local/tmp/chrome-native-tests-command-line'
169 def additional_command_line_flags(self): 169 def additional_command_line_flags(self):
170 return ['--create-stdin-fifo', '--separate-stderr-fifo'] 170 return ['--create-stdin-fifo', '--separate-stderr-fifo', '--disable-impl -side-painting']
171 def device_directory(self): 171 def device_directory(self):
172 return DEVICE_SOURCE_ROOT_DIR + 'drt/' 172 return DEVICE_SOURCE_ROOT_DIR + 'drt/'
173 173
174 # Information required when running layout tests using content_shell as the test runner. 174 # Information required when running layout tests using content_shell as the test runner.
175 class ContentShellDriverDetails(SharedDriverDetails): 175 class ContentShellDriverDetails(SharedDriverDetails):
176 def apk_name(self): 176 def apk_name(self):
177 return 'apks/ContentShell.apk' 177 return 'apks/ContentShell.apk'
178 def package_name(self): 178 def package_name(self):
179 return 'org.chromium.content_shell_apk' 179 return 'org.chromium.content_shell_apk'
180 def activity_name(self): 180 def activity_name(self):
(...skipping 820 matching lines...) Expand 10 before | Expand all | Expand 10 after
1001 return command 1001 return command
1002 1002
1003 def _read_prompt(self, deadline): 1003 def _read_prompt(self, deadline):
1004 last_char = '' 1004 last_char = ''
1005 while True: 1005 while True:
1006 current_char = self._server_process.read_stdout(deadline, 1) 1006 current_char = self._server_process.read_stdout(deadline, 1)
1007 if current_char == ' ': 1007 if current_char == ' ':
1008 if last_char in ('#', '$'): 1008 if last_char in ('#', '$'):
1009 return 1009 return
1010 last_char = current_char 1010 last_char = current_char
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698