Chromium Code Reviews| Index: tools/clang/scripts/test_tool.py |
| diff --git a/tools/clang/scripts/test_tool.py b/tools/clang/scripts/test_tool.py |
| index d2b87a0e10eed72ec92cc58542db1007525cb83b..a99e9f48ae3bcacb9f24f15cfcf215622087a842 100755 |
| --- a/tools/clang/scripts/test_tool.py |
| +++ b/tools/clang/scripts/test_tool.py |
| @@ -15,10 +15,13 @@ import shutil |
| import sys |
| -def _GenerateCompileCommands(files): |
| +def _GenerateCompileCommands(files, include_paths): |
|
Nico
2013/06/11 19:58:13
fyi: ninja 1.3.4 (now in depot_tools) now has a -t
dcheng
2013/06/11 20:07:41
The problem is these test files don't end up in a
|
| """Returns a JSON string containing a compilation database for the input.""" |
| + include_path_flags = ''.join('-I %s' % include_path |
| + for include_path in include_paths) |
| return json.dumps([{'directory': '.', |
| - 'command': 'clang++ -fsyntax-only -c %s' % f, |
| + 'command': 'clang++ -fsyntax-only %s -c %s' % ( |
| + include_path_flags, f), |
| 'file': f} for f in files], indent=2) |
| @@ -46,6 +49,9 @@ def main(argv): |
| for source_file in source_files] |
| expected_files = ['-'.join([source_file.rsplit('-', 2)[0], 'expected.cc']) |
| for source_file in source_files] |
| + include_paths = [] |
| + include_paths.append( |
| + os.path.realpath(os.path.join(tools_clang_directory, '../..'))) |
| try: |
| # Set up the test environment. |
| @@ -58,7 +64,7 @@ def main(argv): |
| subprocess.check_call(args) |
| # Generate a temporary compilation database to run the tool over. |
| with open(compile_database, 'w') as f: |
| - f.write(_GenerateCompileCommands(actual_files)) |
| + f.write(_GenerateCompileCommands(actual_files, include_paths)) |
| args = ['python', |
| os.path.join(tools_clang_scripts_directory, 'run_tool.py'), |