diff options
| -rw-r--r-- | lib/IR/GCOV.cpp | 14 | ||||
| -rw-r--r-- | tools/llvm-cov/llvm-cov.cpp | 12 |
2 files changed, 19 insertions, 7 deletions
diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp index a33da2a552..9f4b5367e1 100644 --- a/lib/IR/GCOV.cpp +++ b/lib/IR/GCOV.cpp @@ -266,18 +266,20 @@ void FileInfo::print(raw_fd_ostream &OS, StringRef gcnoFile, for (StringMap<LineCounts>::iterator I = LineInfo.begin(), E = LineInfo.end(); I != E; ++I) { StringRef Filename = I->first(); - OS << " -: 0:Source:" << Filename << "\n"; - OS << " -: 0:Graph:" << gcnoFile << "\n"; - OS << " -: 0:Data:" << gcdaFile << "\n"; - OS << " -: 0:Runs:" << RunCount << "\n"; - OS << " -: 0:Programs:" << ProgramCount << "\n"; - LineCounts &L = LineInfo[Filename]; OwningPtr<MemoryBuffer> Buff; if (error_code ec = MemoryBuffer::getFileOrSTDIN(Filename, Buff)) { errs() << Filename << ": " << ec.message() << "\n"; return; } StringRef AllLines = Buff.take()->getBuffer(); + + OS << " -: 0:Source:" << Filename << "\n"; + OS << " -: 0:Graph:" << gcnoFile << "\n"; + OS << " -: 0:Data:" << gcdaFile << "\n"; + OS << " -: 0:Runs:" << RunCount << "\n"; + OS << " -: 0:Programs:" << ProgramCount << "\n"; + + LineCounts &L = LineInfo[Filename]; uint32_t i = 0; while (!AllLines.empty()) { if (L.find(i) != L.end()) { diff --git a/tools/llvm-cov/llvm-cov.cpp b/tools/llvm-cov/llvm-cov.cpp index ad6c671815..18277737b6 100644 --- a/tools/llvm-cov/llvm-cov.cpp +++ b/tools/llvm-cov/llvm-cov.cpp @@ -20,6 +20,7 @@ #include "llvm/Support/raw_ostream.h" #include "llvm/Support/Signals.h" #include "llvm/Support/system_error.h" +#include <unistd.h> using namespace llvm; static cl::opt<bool> @@ -34,6 +35,9 @@ InputGCDA("gcda", cl::desc("<input gcda file>"), cl::init("")); static cl::opt<std::string> OutputFile("o", cl::desc("<output llvm-cov file>"), cl::init("-")); +static cl::opt<std::string> +WorkingDir("C", cl::desc("change path of working directory"), + cl::init("")); //===----------------------------------------------------------------------===// int main(int argc, char **argv) { @@ -44,6 +48,13 @@ int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, "llvm coverage tool\n"); + if (!WorkingDir.empty()) { + if (chdir(WorkingDir.c_str()) == -1) { + errs() << "Cannot change to directory: " << WorkingDir << ".\n"; + return 1; + } + } + std::string ErrorInfo; raw_fd_ostream OS(OutputFile.c_str(), ErrorInfo); if (!ErrorInfo.empty()) @@ -77,7 +88,6 @@ int main(int argc, char **argv) { } } - if (DumpGCOV) GF.dump(); |