summaryrefslogtreecommitdiffstats
path: root/tools/checklicenses
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 18:18:05 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-26 18:18:05 +0000
commit71bb059f2c4deb5b845b2a3a52f388dba9b1b908 (patch)
treeb6b1085a5aa1794233ba3b2f663b47dbbdd4abee /tools/checklicenses
parent1e9f11922707dc7ff15b1fbb4c9f97a4700d1205 (diff)
downloadchromium_src-71bb059f2c4deb5b845b2a3a52f388dba9b1b908.zip
chromium_src-71bb059f2c4deb5b845b2a3a52f388dba9b1b908.tar.gz
chromium_src-71bb059f2c4deb5b845b2a3a52f388dba9b1b908.tar.bz2
Re-enable check_licenses.
It only runs on Linux clobber bot now. BUG=28291 Review URL: http://codereview.chromium.org/8041028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/checklicenses')
-rwxr-xr-xtools/checklicenses/checklicenses.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/checklicenses/checklicenses.py b/tools/checklicenses/checklicenses.py
index 8ae2858..7528e51 100755
--- a/tools/checklicenses/checklicenses.py
+++ b/tools/checklicenses/checklicenses.py
@@ -253,6 +253,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'third_party/lcov/contrib/galaxy/genflat.pl': [
'GPL (v2 or later)',
],
+ 'third_party/lcov-1.9/contrib/galaxy/genflat.pl': [
+ 'GPL (v2 or later)',
+ ],
'third_party/leveldatabase/src/util/posix_logger.h': [
'UNKNOWN',
],
@@ -520,11 +523,6 @@ def main(options, args):
if '__main__' == __name__:
- # Script takes 6 minutes when it succeeds, and often times out after 10
- # minutes. Enable by default when it's fast.
- print "\nNot running for now because it is slow and flakey\n"
- print "\nSUCCESS\n"
- sys.exit(0)
default_root = os.path.abspath(
os.path.join(os.path.dirname(__file__), '..', '..'))
option_parser = optparse.OptionParser()