Index: cfe/trunk/tools/scan-build-py/libscanbuild/runner.py =================================================================== --- cfe/trunk/tools/scan-build-py/libscanbuild/runner.py +++ cfe/trunk/tools/scan-build-py/libscanbuild/runner.py @@ -205,19 +205,8 @@ 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. """ Index: cfe/trunk/tools/scan-build-py/tests/unit/test_runner.py =================================================================== --- cfe/trunk/tools/scan-build-py/tests/unit/test_runner.py +++ cfe/trunk/tools/scan-build-py/tests/unit/test_runner.py @@ -219,20 +219,6 @@ 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()