maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[analyzer] scan-build-py: Remove relative path hack for SATestsBuild.py 

Remove the relative path hack in scan-build-py that converts a fully qualified
directory name and a fully qualified file path to a relative path before running
the analyzer on a file.

This hack is not needed: the bad interaction with SATestsBuild.py it was
intended to address is actually the same underlying problem that r280768 fixed.
Further, because the hack would always relativize paths, it caused
SATestBuild.py to be unable to properly line up issues when the build system
changed directory and then built a source file in a child directory but used a
fully-qualified path for the source file.

Differential Revision: https://reviews.llvm.org/D24470

llvm-svn: 281516
This commit is contained in:
Devin Coughlin 2016-09-14 18:14:11 +00:00
parent 0289c5bbcd
commit aed7b8ae86
2 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
clang/tools/scan-build-py/libscanbuild/runner.py
View File

@ -205,19 +205,8 @@ def filter_debug_flags(opts, continuation=run_analyzer):
return continuation(opts)
@require(['file', 'directory'])
def set_file_path_relative(opts, continuation=filter_debug_flags):
""" Set source file path to relative to the working directory.
The only purpose of this function is to pass the SATestBuild.py tests. """
opts.update({'file': os.path.relpath(opts['file'], opts['directory'])})
return continuation(opts)
@require(['language', 'compiler', 'file', 'flags'])
def language_check(opts, continuation=set_file_path_relative):
def language_check(opts, continuation=filter_debug_flags):
""" Find out the language from command line parameters or file name
extension. The decision also influenced by the compiler invocation. """

14
clang/tools/scan-build-py/tests/unit/test_runner.py
View File

@ -219,20 +219,6 @@ class AnalyzerTest(unittest.TestCase):
self.assertEqual(['-DNDEBUG', '-UNDEBUG'], test(['-DNDEBUG']))
self.assertEqual(['-DSomething', '-UNDEBUG'], test(['-DSomething']))
def test_set_file_relative_path(self):
def test(expected, input):
spy = Spy()
self.assertEqual(spy.success,
sut.set_file_path_relative(input, spy.call))
self.assertEqual(expected, spy.arg['file'])
test('source.c',
{'file': '/home/me/source.c', 'directory': '/home/me'})
test('me/source.c',
{'file': '/home/me/source.c', 'directory': '/home'})
test('../home/me/source.c',
{'file': '/home/me/source.c', 'directory': '/tmp'})
def test_set_language_fall_through(self):
def language(expected, input):
spy = Spy()