From 6cd7a3fa797dc9b337c60cced2321da2d65884fb Mon Sep 17 00:00:00 2001 From: Yuchen Wu Date: Tue, 3 Dec 2013 00:57:11 +0000 Subject: llvm-cov: Removed output to STDOUT/specified file. Instead of asking the user to specify a single file to output coverage info and defaulting to STDOUT, llvm-cov now creates files for each source file with a naming system of: + ".llcov". This is what gcov does and although it can clutter the working directory with numerous coverage files, it will be easier to hook the llvm-cov output to tools which operate on this assumption (such as lcov). git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@196184 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/GCOV.h | 2 +- lib/IR/GCOV.cpp | 9 +++++++-- test/tools/llvm-cov/llvm-cov.test | 5 +++-- tools/llvm-cov/llvm-cov.cpp | 12 +----------- 4 files changed, 12 insertions(+), 16 deletions(-) diff --git a/include/llvm/Support/GCOV.h b/include/llvm/Support/GCOV.h index c709af5d50..9aa44139f0 100644 --- a/include/llvm/Support/GCOV.h +++ b/include/llvm/Support/GCOV.h @@ -279,7 +279,7 @@ public: } void setRunCount(uint32_t Runs) { RunCount = Runs; } void setProgramCount(uint32_t Programs) { ProgramCount = Programs; } - void print(raw_fd_ostream &OS, StringRef gcnoFile, StringRef gcdaFile) const; + void print(StringRef gcnoFile, StringRef gcdaFile) const; private: StringMap LineInfo; uint32_t RunCount; diff --git a/lib/IR/GCOV.cpp b/lib/IR/GCOV.cpp index bcc62b11d5..394c683cee 100644 --- a/lib/IR/GCOV.cpp +++ b/lib/IR/GCOV.cpp @@ -317,8 +317,7 @@ void GCOVBlock::dump() const { // FileInfo implementation. /// print - Print source files with collected line count information. -void FileInfo::print(raw_fd_ostream &OS, StringRef gcnoFile, - StringRef gcdaFile) const { +void FileInfo::print(StringRef gcnoFile, StringRef gcdaFile) const { for (StringMap::const_iterator I = LineInfo.begin(), E = LineInfo.end(); I != E; ++I) { StringRef Filename = I->first(); @@ -329,6 +328,12 @@ void FileInfo::print(raw_fd_ostream &OS, StringRef gcnoFile, } StringRef AllLines = Buff->getBuffer(); + std::string CovFilename = Filename.str() + ".llcov"; + std::string ErrorInfo; + raw_fd_ostream OS(CovFilename.c_str(), ErrorInfo); + if (!ErrorInfo.empty()) + errs() << ErrorInfo << "\n"; + OS << " -: 0:Source:" << Filename << "\n"; OS << " -: 0:Graph:" << gcnoFile << "\n"; OS << " -: 0:Data:" << gcdaFile << "\n"; diff --git a/test/tools/llvm-cov/llvm-cov.test b/test/tools/llvm-cov/llvm-cov.test index 39f112e8d2..55af86e851 100644 --- a/test/tools/llvm-cov/llvm-cov.test +++ b/test/tools/llvm-cov/llvm-cov.test @@ -2,8 +2,9 @@ RUN: cd %p/Inputs # "cd" is unsupported in lit internal runner. REQUIRES: shell -RUN: llvm-cov -gcno=test.gcno -gcda=test.gcda \ -RUN: | diff -aub test.cpp.gcov - +RUN: llvm-cov -gcno=test.gcno -gcda=test.gcda +RUN: diff test.cpp.gcov test.cpp.llcov +RUN: rm test.cpp.llcov RUN: not llvm-cov -gcno=test_read_fail.gcno -gcda=test.gcda diff --git a/tools/llvm-cov/llvm-cov.cpp b/tools/llvm-cov/llvm-cov.cpp index 5f6999e905..7f4d53e848 100644 --- a/tools/llvm-cov/llvm-cov.cpp +++ b/tools/llvm-cov/llvm-cov.cpp @@ -17,7 +17,6 @@ #include "llvm/Support/ManagedStatic.h" #include "llvm/Support/MemoryObject.h" #include "llvm/Support/PrettyStackTrace.h" -#include "llvm/Support/raw_ostream.h" #include "llvm/Support/Signals.h" #include "llvm/Support/system_error.h" using namespace llvm; @@ -31,10 +30,6 @@ InputGCNO("gcno", cl::desc(""), cl::init("")); static cl::opt InputGCDA("gcda", cl::desc(""), cl::init("")); -static cl::opt -OutputFile("o", cl::desc(""), cl::init("-")); - - //===----------------------------------------------------------------------===// int main(int argc, char **argv) { // Print a stack trace if we signal out. @@ -44,11 +39,6 @@ int main(int argc, char **argv) { cl::ParseCommandLineOptions(argc, argv, "llvm coverage tool\n"); - std::string ErrorInfo; - raw_fd_ostream OS(OutputFile.c_str(), ErrorInfo); - if (!ErrorInfo.empty()) - errs() << ErrorInfo << "\n"; - GCOVFile GF; if (InputGCNO.empty()) errs() << " " << argv[0] << ": No gcov input file!\n"; @@ -83,6 +73,6 @@ int main(int argc, char **argv) { FileInfo FI; GF.collectLineCounts(FI); - FI.print(OS, InputGCNO, InputGCDA); + FI.print(InputGCNO, InputGCDA); return 0; } -- cgit v1.2.3