Remove test suffixes from included filename in boilerplate.py.

tools/boilerplate.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Create files with copyright boilerplate and header include guards.
 
 Usage: tools/boilerplate.py path/to/file.{h,cc}
 """
 
@@ skipping 33 matching lines @@
   return '\n'.join([
     '',
     '#ifndef ' + guard,
     '#define ' + guard,
     '',
     '#endif  // ' + guard,
     ''
   ])
 
 
+def _RemoveTestSuffix(filename):
+  base, _ = os.path.splitext(filename)
+  if base[-5:] == '_test':

[Robert Sesek, 2016/12/13 17:23:20]

It may be easier to maintain something like this:

suffixes = [ '_test', '_unittest' ]
for suffix in suffixes:
  l = len(suffix)
  if base[-l:] == suffix:
    return base[:l]

... which means you could also add _browsertest easily.

[Bence, 2016/12/14 12:02:19]

Done.

+    return base[:-5]
+  if base[-9:] == '_unittest':
+    return base[:-9]
+  return base
+
 def _CppImplementation(filename):
-  base, _ = os.path.splitext(filename)
-  include = '#include "' + base + '.h"'
+  include = '#include "' + _RemoveTestSuffix(filename) + '.h"'
   return '\n'.join(['', include])
 
 
 def _ObjCppImplementation(filename):
-  base, _ = os.path.splitext(filename)
-  include = '#import "' + base + '.h"'
+  include = '#import "' + _RemoveTestSuffix(filename) + '.h"'
   return '\n'.join(['', include])
 
 
 def _CreateFile(filename):
   contents = _GetHeader(filename) + '\n'
 
   if filename.endswith('.h'):
     contents += _CppHeader(filename)
   elif filename.endswith('.cc'):
     contents += _CppImplementation(filename)
@@ skipping 21 matching lines @@
     if os.path.exists(f):
       print >> sys.stderr, 'A file at path %s already exists' % f
       return 2
 
   for f in files:
     _CreateFile(f)
 
 
 if __name__ == '__main__':
   sys.exit(Main())