Make check_licenses pass on trybots.

tools/checklicenses/checklicenses.py

 #!/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.
 
 """Makes sure that all files contain proper licensing information."""
 
 
 import optparse
 import os.path
@@ skipping 15 matching lines @@
   python checklicenses.py --root ~/chromium/src third_party"""
 
 
 WHITELISTED_LICENSES = [
     'Apache (v2.0)',
     'Apache (v2.0) BSD (2 clause)',
     'BSD',
     'BSD (2 clause)',
     'BSD (2 clause) MIT/X11 (BSD like)',
     'BSD (3 clause)',
+    'BSD (3 clause) ISC',
+    'BSD (3 clause) LGPL (v2.1 or later) (with incorrect FSF address)',
     'BSD (3 clause) MIT/X11 (BSD like)',
     'BSD (4 clause)',
     'BSD-like',
 
     # TODO(phajdan.jr): Make licensecheck not print BSD-like twice.
     'BSD-like BSD (2 clause)',
     'BSD-like BSD (3 clause)',
     'BSD-like MIT/X11 (BSD like)',
 
     'BSL (v1.0)',
     # TODO(phajdan.jr): Make licensecheck not print the comma after 3.1.
     'BSL (v1.0) GPL (v3.1,)',
     'ISC',
     'LGPL',
     'LGPL (v2)',
     'LGPL (v2 or later)',
     'LGPL (v2 or later) (with incorrect FSF address)',
     'LGPL (v2.1)',
     'LGPL (v3 or later)',
 
     # TODO(phajdan.jr): Make licensecheck convert that comma to a dot.
     'LGPL (v2,1 or later)',
 
     'LGPL (v2.1 or later)',
     'LGPL (v2.1 or later) (with incorrect FSF address)',
     'MPL (v1.0) LGPL (v2 or later) (with incorrect FSF address)',
+    'MPL (v1.1)',
     'MPL (v1.1) BSD-like',
     'MPL (v1.1) BSD-like GPL (unversioned/unknown version)',
     'MPL (v1.1) GPL (unversioned/unknown version)',
 
     # TODO(phajdan.jr): Make licensecheck not print the comma after 1.1.
     'MPL (v1.1,) GPL (unversioned/unknown version) LGPL (v2 or later)',
     'MPL (v1.1,) GPL (unversioned/unknown version) LGPL (v2.1 or later)',
 
     'MIT/X11 (BSD like)',
     'Ms-PL',
@@ skipping 43 matching lines @@
     ],
     'gpu/KHR': [
         'UNKNOWN',
     ],
     'gpu/gles2_conform_support/egl/native/EGL': [
         'UNKNOWN',
     ],
     'native_client': [
         'UNKNOWN',
     ],
-    'native_client/toolchain/linux_x86_newlib': [
+    'native_client/toolchain': [
+        'BSD GPL (v2 or later) (with incorrect FSF address)',
+        'BSD (2 clause) GPL (v2 or later)',
+        'BSL (v1.0) GPL',
         'GPL',
+        'GPL (with incorrect FSF address)',
+        'GPL (unversioned/unknown version)',
+        'GPL (v2)',
+
+        # TODO(phajdan.jr): Make licensecheck not print the comma after v2.
+        'GPL (v2,)',
+
+        'GPL (v2 or later)',
+        'GPL (v2 or later) (with incorrect FSF address)',
+
+        # TODO(phajdan.jr): Make licensecheck not print the comma after 3.1.
         'GPL (v3.1,)',
     ],
     'net/disk_cache/hash.cc': [
         'UNKNOWN',
     ],
     'net/third_party/nss/patches/applypatches.sh': [
         'UNKNOWN',
     ],
     'net/tools/spdyshark': [
         'GPL (v2 or later) (with incorrect FSF address)',
@@ skipping 230 matching lines @@
     ],
     'third_party/yasm/source': [
         'UNKNOWN',
     ],
     'third_party/zlib/contrib/minizip': [
         'UNKNOWN',
     ],
     'third_party/zlib/trees.h': [
         'UNKNOWN',
     ],
-    'third_party/WebKit/LayoutTests/fast/xsl': [
-        'MPL (v1.1)',
-    ],
     'tools/dromaeo_benchmark_runner/dromaeo_benchmark_runner.py': [
         'UNKNOWN',
     ],
     'tools/emacs': [
         'UNKNOWN',
     ],
     'tools/grit/grit/node/custom/__init__.py': [
         'UNKNOWN',
     ],
     'tools/gyp/test': [
@@ skipping 107 matching lines @@
     sys.exit(0)
   else:
     print "\nFAILED\n"
     print "Please read",
     print "http://www.chromium.org/developers/adding-3rd-party-libraries"
     print "for more info how to handle the failure."
     print
     print "Please respect OWNERS of checklicenses.py. Changes violating"
     print "this requirement may be reverted."
 
-    # TODO(phajdan.jr): Switch back to exit(1) when it lands on buildbot.
-    # 88 is buildbot "warning" code, it doesn't turn the step red but orange.
-    sys.exit(88)
+    sys.exit(1)
 
 
 if '__main__' == __name__:
   default_root = os.path.abspath(
       os.path.join(os.path.dirname(__file__), '..', '..'))
   option_parser = optparse.OptionParser()
   option_parser.add_option('--root', default=default_root,
                            dest='base_directory',
                            help='Specifies the repository root. This defaults '
                            'to "../.." relative to the script file, which '
                            'will normally be the repository root.')
   option_parser.add_option('-v', '--verbose', action='store_true',
                            default=False, help='Print debug logging')
   options, args = option_parser.parse_args()
   main(options, args)