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

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

Issue 14172003: Move Chromium's TestExpectations and ContentShellTestExpectations to generic location (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Removed change to ContentShellTestExpectations Created 7 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « LayoutTests/platform/chromium/TestExpectations ('k') | 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 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 exists = True 234 exists = True
235 break 235 break
236 if not exists: 236 if not exists:
237 _log.error('You are missing %s under %s. Try installing %s. See build instructions.' % (font_file, font_dirs, package)) 237 _log.error('You are missing %s under %s. Try installing %s. See build instructions.' % (font_file, font_dirs, package))
238 return False 238 return False
239 return True 239 return True
240 240
241 def _port_specific_expectations_files(self): 241 def _port_specific_expectations_files(self):
242 # LayoutTests/platform/chromium-android/TestExpectations should contain only the rules to 242 # LayoutTests/platform/chromium-android/TestExpectations should contain only the rules to
243 # skip tests for the features not supported or not testable on Android. 243 # skip tests for the features not supported or not testable on Android.
244 # Other rules should be in LayoutTests/platform/chromium/TestExpectation s. 244 # Other rules should be in LayoutTests/TestExpectations.
245 android_expectations_file = self.path_from_webkit_base('LayoutTests', 'p latform', 'chromium-android', 'TestExpectations') 245 android_expectations_file = self.path_from_webkit_base('LayoutTests', 'p latform', 'chromium-android', 'TestExpectations')
246 return super(ChromiumAndroidPort, self)._port_specific_expectations_file s() + [android_expectations_file] 246 return super(ChromiumAndroidPort, self)._port_specific_expectations_file s() + [android_expectations_file]
247 247
248 def requires_http_server(self): 248 def requires_http_server(self):
249 """Chromium Android runs tests on devices, and uses the HTTP server to 249 """Chromium Android runs tests on devices, and uses the HTTP server to
250 serve the actual layout tests to DumpRenderTree.""" 250 serve the actual layout tests to DumpRenderTree."""
251 return True 251 return True
252 252
253 def start_http_server(self, additional_dirs=None, number_of_servers=0): 253 def start_http_server(self, additional_dirs=None, number_of_servers=0):
254 if not additional_dirs: 254 if not additional_dirs:
(...skipping 669 matching lines...) Expand 10 before | Expand all | Expand 10 after
924 current_char = self._server_process.read_stdout(deadline, 1) 924 current_char = self._server_process.read_stdout(deadline, 1)
925 if current_char == ' ': 925 if current_char == ' ':
926 if last_char in ('#', '$'): 926 if last_char in ('#', '$'):
927 return 927 return
928 last_char = current_char 928 last_char = current_char
929 929
930 def _adb_command(self): 930 def _adb_command(self):
931 if not self._adb_command_base: 931 if not self._adb_command_base:
932 self._adb_command_base = [self._port.path_to_adb(), '-s', self._devi ce_serial] 932 self._adb_command_base = [self._port.path_to_adb(), '-s', self._devi ce_serial]
933 return self._adb_command_base 933 return self._adb_command_base
OLDNEW
« no previous file with comments | « LayoutTests/platform/chromium/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698