Index: tools/clang/scripts/test_tool.py |
diff --git a/tools/clang/scripts/test_tool.py b/tools/clang/scripts/test_tool.py |
index 0e7b843889879e3563dd298962312ca845fc8749..d14dfda452d5e027aace89632275e0693341cd1b 100755 |
--- a/tools/clang/scripts/test_tool.py |
+++ b/tools/clang/scripts/test_tool.py |
@@ -17,7 +17,7 @@ import sys |
def _GenerateCompileCommands(files, include_paths): |
"""Returns a JSON string containing a compilation database for the input.""" |
- include_path_flags = ''.join('-I %s' % include_path |
+ include_path_flags = ' '.join('-I %s' % include_path |
for include_path in include_paths) |
return json.dumps([{'directory': '.', |
'command': 'clang++ -fsyntax-only %s -c %s' % ( |
@@ -52,6 +52,12 @@ def main(argv): |
include_paths = [] |
include_paths.append( |
os.path.realpath(os.path.join(tools_clang_directory, '../..'))) |
Ryan Sleevi
2014/08/23 03:26:36
Ooof. I didn't realize we'd done this.
I had trie
|
+ # Many gtest headers expect to have testing/gtest/include in the include |
+ # search path. |
+ include_paths.append( |
+ os.path.realpath(os.path.join(tools_clang_directory, |
+ '../..', |
+ 'testing/gtest/include'))) |
try: |
# Set up the test environment. |