From adbae7e226e63018f388bdb197ca5c8f36514a45 Mon Sep 17 00:00:00 2001 From: "tony@chromium.org" Date: Thu, 16 Jun 2011 17:15:47 +0000 Subject: Add support for Linux kernels >=3.0-rc1 in Python related build files by: - replacing occurences of sys.platform == 'linux2' with sys.platform.startswith('linux') - congregating occurences of sys.platform in ('linux[X]', 'linuxY', ...) to sys.platform.startswith('linux') - adding the key 'linux3' to all relevant lookup dicts BUG=85845 TEST=Try building chromium on Linux >=3.0-r1 Review URL: http://codereview.chromium.org/7172016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89354 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/code_coverage/coverage_posix.py | 4 ++-- tools/code_coverage/process_coverage.py | 36 +++++---------------------------- 2 files changed, 7 insertions(+), 33 deletions(-) (limited to 'tools/code_coverage') diff --git a/tools/code_coverage/coverage_posix.py b/tools/code_coverage/coverage_posix.py index 25463a3..aaa400a 100755 --- a/tools/code_coverage/coverage_posix.py +++ b/tools/code_coverage/coverage_posix.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -547,7 +547,7 @@ class Coverage(object): return sys.platform == 'darwin' def IsLinux(self): - return sys.platform == 'linux2' + return sys.platform.startswith('linux') def IsWindows(self): """Return True if we are Windows.""" diff --git a/tools/code_coverage/process_coverage.py b/tools/code_coverage/process_coverage.py index 8035974..8f6ccbf 100644 --- a/tools/code_coverage/process_coverage.py +++ b/tools/code_coverage/process_coverage.py @@ -1,33 +1,7 @@ -#!/usr/bin/python2.4 -# -# Copyright 2008, Google Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Google Inc. nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +#!/usr/bin/python +# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. """Script to clean the lcov files and convert it to HTML @@ -382,7 +356,7 @@ def main(): dest='platform', default=None, help=('Platform that the locv file was generated on. Must' - 'be one of {win32, linux2, macosx}')) + 'be one of {win32, linux2, linux3, macosx}')) parser.add_option('-s', '--source', dest='src_dir', -- cgit v1.1