Add a presubmit check so that no new unit tests in content/ are added to the unit_tests target

chrome/PRESUBMIT.py

 # 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 the chrome/ code is cpplint clean."""
+import re

[Jói, 2011/11/29 09:10:30]

Please improve the docstring rather than removing it (it was at line 5 in the
original version of the file).

[jochen (gone - plz use gerrit), 2011/11/29 13:01:11]

Done.

 
 INCLUDE_CPP_FILES_ONLY = (
   r'.*\.cc$', r'.*\.h$'
 )
 
 EXCLUDE = (
   # Objective C confuses everything.
   r'.*cocoa.*',
   r'.*_mac\.(cc|h)$',
   r'.*_mac_.*',
@@ skipping 17 matching lines @@
   # Has safe printf usage that cpplint complains about
   r'safe_browsing_util\.cc$',
   # Too much math on one line?
   r'bloom_filter\.cc$',
   # Bogus ifdef tricks
   r'renderer_webkitplatformsupport_impl\.cc$',
   # Lines > 100 chars
   r'gcapi\.cc$',
 )
 
-def CheckChangeOnUpload(input_api, output_api):
-  results = []
+def _CheckChangeLintsClean(input_api, output_api):
+  """Makes sure that the chrome/ code is cpplint clean."""
   black_list = input_api.DEFAULT_BLACK_LIST + EXCLUDE
   sources = lambda x: input_api.FilterSourceFile(
     x, white_list=INCLUDE_CPP_FILES_ONLY, black_list=black_list)
-  results.extend(input_api.canned_checks.CheckChangeLintsClean(
-      input_api, output_api, sources))
+  return input_api.canned_checks.CheckChangeLintsClean(
+      input_api, output_api, sources)
+
+def _CheckNoContentUnitTestsInChrome(input_api, output_api):
+  """Makes sure that no unit tests from content/ are included in unit_tests."""
+  problems = []
+  for f in input_api.AffectedFiles():
+    if not f.LocalPath().endswith('chrome_tests.gypi'):
+      continue
+
+    for line_num, line in f.ChangedContents():
+      m = re.search(r"'(.*\/content\/.*unittest.*)'", line)
+      if m:
+        problems.append('    %s' % m.group(1))
+
+  if not problems:
+    return []
+  return [output_api.PresubmitPromptWarning(
+      'Unit tests located in content/ should be added to the ' +
+      'content_tests.gypi:content_unittests target.\n' +
+      '\n'.join(problems))]

[Jói, 2011/11/29 09:10:30]

There is another constructor for a message followed by a list of items, that
will format this more nicely.

You can then skip prepending spaces in line 61, and call the constructor like
this (IIRC; check depot_tools/presubmit_support.py if I'm wrong):

  return [output_api.PresubmitPromptWarning(
       'Unit tests located in content/ should be added to the ' +
       'content_tests.gypi:content_unittests target.',
       problems)]

[jochen (gone - plz use gerrit), 2011/11/29 13:01:11]

Done.

+
+def _CommonChecks(input_api, output_api):
+  """Checks common to both upload and commit."""
+  results = []
+  results.extend(_CheckNoContentUnitTestsInChrome(input_api, output_api))
   return results
+
+def CheckChangeOnUpload(input_api, output_api):
+  results = []
+  results.extend(_CommonChecks(input_api, output_api))
+  results.extend(_CheckChangeLintsClean(input_api, output_api))
+  return results
+
+def CheckChangeOnCommit(input_api, output_api):
+  results = []
+  results.extend(_CommonChecks(input_api, output_api))
+  return results