From 74351ff4ac69665bad0f6e5b852de488d36388e1 Mon Sep 17 00:00:00 2001 From: Daniel Jasper Date: Mon, 15 Oct 2012 13:12:24 +0000 Subject: [PATCH] Only report first error when no compilation database is found. Review: http://llvm-reviews.chandlerc.com/D62 llvm-svn: 165933 --- clang/lib/Tooling/CompilationDatabase.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/clang/lib/Tooling/CompilationDatabase.cpp b/clang/lib/Tooling/CompilationDatabase.cpp index 6e94180..4149cda 100644 --- a/clang/lib/Tooling/CompilationDatabase.cpp +++ b/clang/lib/Tooling/CompilationDatabase.cpp @@ -49,14 +49,19 @@ static CompilationDatabase * findCompilationDatabaseFromDirectory(StringRef Directory, std::string &ErrorMessage) { std::stringstream ErrorStream; + bool HasErrorMessage = false; while (!Directory.empty()) { std::string LoadErrorMessage; if (CompilationDatabase *DB = CompilationDatabase::loadFromDirectory(Directory, LoadErrorMessage)) 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); } -- 2.7.4