From 21939df44de1705786c545cd1bf519d47250322d Mon Sep 17 00:00:00 2001 From: Ben Murdoch Date: Tue, 11 May 2010 18:35:50 +0100 Subject: Merge Webkit at r58956: Initial merge by Git. Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228 --- .../Scripts/webkitpy/layout_tests/port/chromium_linux.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py') diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py index 9a595f2..a01bd14 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_linux.py @@ -31,9 +31,7 @@ import logging import os -import platform import signal -import subprocess import chromium @@ -122,15 +120,9 @@ class ChromiumLinuxPort(chromium.ChromiumPort): _log.error(' Please install using: "sudo apt-get install ' 'wdiff"') _log.error('') + # FIXME: The ChromiumMac port always returns True. return result - - def _kill_all_process(self, process_name): - null = open(os.devnull) - subprocess.call(['killall', '-TERM', '-u', os.getenv('USER'), - process_name], stderr=null) - null.close() - def _path_to_apache(self): if self._is_redhat_based(): return '/usr/sbin/httpd' @@ -187,8 +179,8 @@ class ChromiumLinuxPort(chromium.ChromiumPort): # TODO(mmoss) This isn't ideal, since it could conflict with # lighttpd processes not started by http_server.py, # but good enough for now. - self._kill_all_process('lighttpd') - self._kill_all_process('apache2') + self._executive.kill_all("lighttpd") + self._executive.kill_all("apache2") else: try: os.kill(server_pid, signal.SIGTERM) -- cgit v1.1