StarMirror/styleguide
1
0
Fork 0
mirror of https://github.com/google/styleguide.git synced 2024-03-22 13:11:43 +08:00
Code Issues Projects Releases Wiki Activity

cpplint: Fix unittests when the styleguide directory is named otherwise

Browse Source 
Don't hardcode the 'styleguide' directory in unit tests, instead
get it from the ../.. basename.
This commit is contained in:
Igor Murashkin 2017-11-10 16:52:24 -08:00
parent e8ffd7ce60
commit 4e8e56fb65
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpplint/cpplint_unittest.py
View File

@ -4280,12 +4280,14 @@ class CpplintTest(CpplintTestBase):
# (note that CPPLINT.cfg root=setting is always made absolute) # (note that CPPLINT.cfg root=setting is always made absolute)
this_files_path = os.path.dirname(os.path.abspath(__file__)) this_files_path = os.path.dirname(os.path.abspath(__file__))
(styleguide_path, this_files_dir) = os.path.split(this_files_path) (styleguide_path, this_files_dir) = os.path.split(this_files_path)
(styleguide_parent_path, _) = os.path.split(styleguide_path) (styleguide_parent_path, styleguide_dir_name) = os.path.split(styleguide_path)
# parent dir of styleguide # parent dir of styleguide
cpplint._root = styleguide_parent_path cpplint._root = styleguide_parent_path
self.assertIsNotNone(styleguide_parent_path) self.assertIsNotNone(styleguide_parent_path)
# do not hardcode the 'styleguide' repository name, it could be anything.
expected_prefix = re.sub(r'[^a-zA-Z0-9]', '_', styleguide_dir_name).upper() + '_'
# do not have 'styleguide' repo in '/' # do not have 'styleguide' repo in '/'
self.assertEquals('STYLEGUIDE_CPPLINT_CPPLINT_TEST_HEADER_H_', self.assertEquals('%sCPPLINT_CPPLINT_TEST_HEADER_H_' %(expected_prefix),
cpplint.GetHeaderGuardCPPVariable(file_path)) cpplint.GetHeaderGuardCPPVariable(file_path))
# To run the 'relative path' tests, we must be in the directory of this test file. # To run the 'relative path' tests, we must be in the directory of this test file.
@ -4302,7 +4304,7 @@ class CpplintTest(CpplintTestBase):
styleguide_rel_path = os.path.relpath(styleguide_parent_path, styleguide_rel_path = os.path.relpath(styleguide_parent_path,
this_files_path) # '../..' this_files_path) # '../..'
cpplint._root = styleguide_rel_path cpplint._root = styleguide_rel_path
self.assertEquals('STYLEGUIDE_CPPLINT_CPPLINT_TEST_HEADER_H_', self.assertEquals('%sCPPLINT_CPPLINT_TEST_HEADER_H_' %(expected_prefix),
cpplint.GetHeaderGuardCPPVariable(file_path)) cpplint.GetHeaderGuardCPPVariable(file_path))
cpplint._root = None cpplint._root = None