replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only report first error when no compilation database is found. 

Review: http://llvm-reviews.chandlerc.com/D62
llvm-svn: 165933
This commit is contained in:
Daniel Jasper 2012-10-15 13:12:24 +00:00
parent 16205cd4fa
commit 74351ff4ac
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
clang/lib/Tooling/CompilationDatabase.cpp
View File

@ -49,14 +49,19 @@ static CompilationDatabase *
findCompilationDatabaseFromDirectory(StringRef Directory, findCompilationDatabaseFromDirectory(StringRef Directory,
std::string &ErrorMessage) { std::string &ErrorMessage) {
std::stringstream ErrorStream; std::stringstream ErrorStream;
bool HasErrorMessage = false;
while (!Directory.empty()) { while (!Directory.empty()) {
std::string LoadErrorMessage; std::string LoadErrorMessage;
if (CompilationDatabase *DB = if (CompilationDatabase *DB =
CompilationDatabase::loadFromDirectory(Directory, LoadErrorMessage)) CompilationDatabase::loadFromDirectory(Directory, LoadErrorMessage))
return DB; return DB;
ErrorStream << "No compilation database found in " << Directory.str()
<< "\n" << LoadErrorMessage; if (!HasErrorMessage) {
ErrorStream << "No compilation database found in " << Directory.str()
<< " or any parent directory\n" << LoadErrorMessage;
HasErrorMessage = true;
}
Directory = llvm::sys::path::parent_path(Directory); Directory = llvm::sys::path::parent_path(Directory);
} }