Changeset 243373 in webkit
- Timestamp:
- Mar 22, 2019 5:56:32 AM (5 years ago)
- Location:
- trunk/Tools
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r243370 r243373 1 2019-03-22 David Kilzer <ddkilzer@apple.com> 2 3 Back out local changes to Alex's Subversion working directory 4 5 They were accidentally committed. 6 7 * Scripts/webkitpy/common/system/abstractexecutive.py: 8 (AbstractExecutive.wait_newest): 9 * Scripts/webkitpy/common/system/executive.py: 10 (Executive.running_pids): 11 * Scripts/webkitpy/common/system/executive_mock.py: 12 (MockExecutive.running_pids): 13 * Scripts/webkitpy/common/system/executive_unittest.py: 14 (ExecutiveTest.serial_test_running_pids): 15 * Scripts/webkitpy/port/darwin.py: 16 (DarwinPort.check_for_leaks): 17 * Scripts/webkitpy/port/leakdetector.py: 18 (LeakDetector.check_for_leaks): 19 - This was the hack attached to Bug 193772. 20 21 * WebKitTestRunner/mac/WebKitTestRunnerEvent.mm: 22 (+[WebKitTestRunnerEvent mouseLocation]): 23 - This works around a crash on an internal build. 24 1 25 2019-03-22 Tim Horton <timothy_horton@apple.com> 2 26 -
trunk/Tools/Scripts/webkitpy/common/system/abstractexecutive.py
r243319 r243373 75 75 process_name_filter = lambda process_name: True 76 76 77 running_pids , undef= self.running_pids(process_name_filter)77 running_pids = self.running_pids(process_name_filter) 78 78 if not running_pids: 79 79 return -
trunk/Tools/Scripts/webkitpy/common/system/executive.py
r243319 r243373 269 269 if self._is_native_win: 270 270 # FIXME: running_pids isn't implemented on native Windows yet... 271 return [] , []271 return [] 272 272 273 273 if not process_name_filter: … … 275 275 276 276 running_pids = [] 277 running_names = []278 277 if self._is_cygwin: 279 278 ps_process = self.run_command(['ps', '-e'], ignore_errors=True) … … 284 283 if process_name_filter(process_name): 285 284 running_pids.append(int(pid)) 286 running_names.append(os.path.basename(process_name))287 285 self.pid_to_system_pid[int(pid)] = int(winpid) 288 286 except ValueError as e: … … 298 296 if process_name_filter(process_name): 299 297 running_pids.append(int(pid)) 300 running_names.append(os.path.basename(process_name))301 298 except ValueError as e: 302 299 pass 303 300 304 return running_pids, running_names301 return sorted(running_pids) 305 302 306 303 def _windows_image_name(self, process_name): -
trunk/Tools/Scripts/webkitpy/common/system/executive_mock.py
r243319 r243373 83 83 def running_pids(self, process_name_filter): 84 84 running_pids = [] 85 running_names = []86 85 for process_name, process_pid in self._running_pids.iteritems(): 87 86 if process_name_filter(process_name): 88 87 running_pids.append(process_pid) 89 running_names.append(process_name)90 88 91 89 _log.info("MOCK running_pids: %s" % running_pids) 92 _log.info("MOCK running_names: %s" % running_names) 93 return running_pids, running_names 90 return running_pids 94 91 95 92 def run_and_throw_if_fail(self, args, quiet=False, cwd=None, env=None): -
trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py
r243319 r243373 232 232 233 233 executive = Executive() 234 pids , names= executive.running_pids()234 pids = executive.running_pids() 235 235 self.assertIn(os.getpid(), pids) 236 self.assertIn(os.path.basename(sys.executable), names)237 236 238 237 def serial_test_run_in_parallel(self): -
trunk/Tools/Scripts/webkitpy/port/darwin.py
r243319 r243373 23 23 import logging 24 24 import os 25 import re26 25 import time 27 26 … … 62 61 return 63 62 # We could use http://code.google.com/p/psutil/ to get the process_name from the pid. 64 if self.get_option('webkit_test_runner'): 65 # FIXME: This assumes no other processes spawning WebKit2 processes are running. 66 webkit_process_re = re.compile('.*/com\.apple\.WebKit\.\S+\.Development$') 67 process_name_filter = lambda process_name: re.match(webkit_process_re, process_name) 68 process_ids, process_names = self._executive.running_pids(process_name_filter) or [] 69 process_ids.insert(0, process_pid) 70 process_names.insert(0, process_name) 71 self._leak_detector.check_for_leaks(process_names, process_ids) 72 else: 73 self._leak_detector.check_for_leaks(process_name, process_pid) 63 self._leak_detector.check_for_leaks(process_name, process_pid) 74 64 75 65 def print_leaks_summary(self): -
trunk/Tools/Scripts/webkitpy/port/leakdetector.py
r243319 r243373 119 119 def check_for_leaks(self, process_name, process_pid): 120 120 _log.debug("Checking for leaks in %s" % process_name) 121 pids = process_pid if isinstance(process_pid, list) else [process_pid]122 names = process_name if isinstance(process_name, list) else [process_name]123 121 try: 124 for i in range(len(pids)): 125 pid = pids[i] 126 name = names[i] 127 leaks_filename = self.leaks_file_name(name, pid) 128 leaks_output_path = self._filesystem.join(self._port.results_directory(), leaks_filename) 129 # Oddly enough, run-leaks (or the underlying leaks tool) does not seem to always output utf-8, 130 # thus we pass decode_output=False. Without this code we've seen errors like: 131 # "UnicodeDecodeError: 'utf8' codec can't decode byte 0x88 in position 779874: unexpected code byte" 132 self._port._run_script("run-leaks", self._leaks_args(name, pid), include_configuration_arguments=False, decode_output=False) 133 leaks_output = self._filesystem.read_binary_file(leaks_output_path) 122 leaks_filename = self.leaks_file_name(process_name, process_pid) 123 leaks_output_path = self._filesystem.join(self._port.results_directory(), leaks_filename) 124 # Oddly enough, run-leaks (or the underlying leaks tool) does not seem to always output utf-8, 125 # thus we pass decode_output=False. Without this code we've seen errors like: 126 # "UnicodeDecodeError: 'utf8' codec can't decode byte 0x88 in position 779874: unexpected code byte" 127 self._port._run_script("run-leaks", self._leaks_args(process_name, process_pid), include_configuration_arguments=False, decode_output=False) 128 leaks_output = self._filesystem.read_binary_file(leaks_output_path) 134 129 except ScriptError as e: 135 130 _log.warn("Failed to run leaks tool: %s" % e.message_with_output()) -
trunk/Tools/WebKitTestRunner/mac/WebKitTestRunnerEvent.mm
r243319 r243373 36 36 + (NSPoint)mouseLocation 37 37 { 38 return NSMakePoint(0, 0);39 /*40 38 WKPoint location = WTR::TestController::singleton().eventSenderProxy()->position(); 41 39 return [WTR::TestController::singleton().mainWebView()->platformWindow() convertBaseToScreen:NSMakePoint(location.x, location.y)]; 42 */43 40 } 44 41
Note: See TracChangeset
for help on using the changeset viewer.