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

Side by Side Diff: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver.py

Issue 2627213003: Rename LayoutTests/imported/ -> LayoutTests/external/. (Closed)
Patch Set: Created 3 years, 11 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
OLDNEW
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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 # FIXME: Seems this could just be inlined into callers. 221 # FIXME: Seems this could just be inlined into callers.
222 @classmethod 222 @classmethod
223 def _command_wrapper(cls, wrapper_option): 223 def _command_wrapper(cls, wrapper_option):
224 # Hook for injecting valgrind or other runtime instrumentation, 224 # Hook for injecting valgrind or other runtime instrumentation,
225 # used by e.g. tools/valgrind/valgrind_tests.py. 225 # used by e.g. tools/valgrind/valgrind_tests.py.
226 return shlex.split(wrapper_option) if wrapper_option else [] 226 return shlex.split(wrapper_option) if wrapper_option else []
227 227
228 HTTP_DIR = "http/tests/" 228 HTTP_DIR = "http/tests/"
229 HTTP_LOCAL_DIR = "http/tests/local/" 229 HTTP_LOCAL_DIR = "http/tests/local/"
230 WPT_DIR = "imported/wpt/" 230 WPT_DIR = "external/wpt/"
231 231
232 def is_http_test(self, test_name): 232 def is_http_test(self, test_name):
233 return test_name.startswith(self.HTTP_DIR) and not test_name.startswith( self.HTTP_LOCAL_DIR) 233 return test_name.startswith(self.HTTP_DIR) and not test_name.startswith( self.HTTP_LOCAL_DIR)
234 234
235 def _get_http_host_and_ports_for_test(self, test_name): 235 def _get_http_host_and_ports_for_test(self, test_name):
236 if self._port.should_use_wptserve(test_name): 236 if self._port.should_use_wptserve(test_name):
237 # TODO(burnik): Read from config or args. 237 # TODO(burnik): Read from config or args.
238 return ("web-platform.test", 8001, 8444) 238 return ("web-platform.test", 8001, 8444)
239 else: 239 else:
240 return ("127.0.0.1", 8000, 8443) 240 return ("127.0.0.1", 8000, 8443)
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 self.decoded_content = None 546 self.decoded_content = None
547 self.malloc = None 547 self.malloc = None
548 self.js_heap = None 548 self.js_heap = None
549 self.stdin_path = None 549 self.stdin_path = None
550 550
551 def decode_content(self): 551 def decode_content(self):
552 if self.encoding == 'base64' and self.content is not None: 552 if self.encoding == 'base64' and self.content is not None:
553 self.decoded_content = base64.b64decode(self.content) 553 self.decoded_content = base64.b64decode(self.content)
554 else: 554 else:
555 self.decoded_content = self.content 555 self.decoded_content = self.content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698