diff options
| -rw-r--r-- | clang/tools/scan-build-py/libscanbuild/runner.py | 13 | ||||
| -rw-r--r-- | clang/tools/scan-build-py/tests/unit/test_runner.py | 14 |
2 files changed, 1 insertions, 26 deletions
diff --git a/clang/tools/scan-build-py/libscanbuild/runner.py b/clang/tools/scan-build-py/libscanbuild/runner.py index 628ad90d627..72d02c85fed 100644 --- a/clang/tools/scan-build-py/libscanbuild/runner.py +++ b/clang/tools/scan-build-py/libscanbuild/runner.py @@ -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. """ diff --git a/clang/tools/scan-build-py/tests/unit/test_runner.py b/clang/tools/scan-build-py/tests/unit/test_runner.py index b4730a1c519..2d090622332 100644 --- a/clang/tools/scan-build-py/tests/unit/test_runner.py +++ b/clang/tools/scan-build-py/tests/unit/test_runner.py @@ -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() |
