diff options
| author | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 00:55:46 +0000 |
|---|---|---|
| committer | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-03 00:55:46 +0000 |
| commit | b3d5b80c2fd7db2ab9b7f9aabd971f3b5f5024a3 (patch) | |
| tree | ed00fed1594ebf1eed28421fa2610682515737ac | |
| parent | e93d3f54c2ec7c4c2eb2724fde750a640cc331f1 (diff) | |
| download | chromium_src-b3d5b80c2fd7db2ab9b7f9aabd971f3b5f5024a3.zip chromium_src-b3d5b80c2fd7db2ab9b7f9aabd971f3b5f5024a3.tar.gz chromium_src-b3d5b80c2fd7db2ab9b7f9aabd971f3b5f5024a3.tar.bz2 | |
Change the kill commands on the mac to be silent when there's nothing to kill.
R=jrg@chromium.org
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/465017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33639 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/platform_utils_mac.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py index 4da1731..a7ed086 100644 --- a/webkit/tools/layout_tests/layout_package/platform_utils_mac.py +++ b/webkit/tools/layout_tests/layout_package/platform_utils_mac.py @@ -103,8 +103,12 @@ def ShutDownHTTPServer(server_process): # $ killall -u $USER -TERM lighttpd # killall: illegal option -- T # Use of the earlier -TERM placement is just fine on 10.5. - subprocess.call(['killall', '-TERM', '-u', os.getenv('USER'), 'lighttpd']) - subprocess.call(['killall', '-TERM', '-u', os.getenv('USER'), 'httpd']) + null = open("/dev/null"); + subprocess.call(['killall', '-TERM', '-u', os.getenv('USER'), 'lighttpd'], + stderr=null) + subprocess.call(['killall', '-TERM', '-u', os.getenv('USER'), 'httpd'], + stderr=null) + null.close() else: os.kill(server_process.pid, signal.SIGTERM) |