[llvm] r275520 - [llvm-cov] Improve error messages

[Vedant Kumar via llvm-commits]

Author: vedantk
Date: Thu Jul 14 20:53:39 2016
New Revision: 275520

URL: http://llvm.org/viewvc/llvm-project?rev=275520&view=rev
Log:
[llvm-cov] Improve error messages

While we're at it, extend an existing test to make sure that error
messages look reasonable.

Modified:
    llvm/trunk/test/tools/llvm-cov/double_dots.c
    llvm/trunk/tools/llvm-cov/CodeCoverage.cpp

Modified: llvm/trunk/test/tools/llvm-cov/double_dots.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/double_dots.c?rev=275520&r1=275519&r2=275520&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-cov/double_dots.c (original)
+++ llvm/trunk/test/tools/llvm-cov/double_dots.c Thu Jul 14 20:53:39 2016
@@ -15,3 +15,8 @@ int main() {}
 
 // RUN: FileCheck -check-prefix=REL-INDEX -input-file %t.dir/index.txt %s
 // REL-INDEX-NOT: %t.dir
+
+// Check that we get the right error when writing to an invalid path:
+
+// RUN: not llvm-cov show %S/Inputs/double_dots.covmapping -instr-profile=%t.profdata -o /dev/null 2>&1 | FileCheck %s -check-prefix=ERROR-MESSAGE
+// ERROR-MESSAGE: error: Not a directory: Could not create index file!

Modified: llvm/trunk/tools/llvm-cov/CodeCoverage.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cov/CodeCoverage.cpp?rev=275520&r1=275519&r2=275520&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-cov/CodeCoverage.cpp (original)
+++ llvm/trunk/tools/llvm-cov/CodeCoverage.cpp Thu Jul 14 20:53:39 2016
@@ -117,7 +117,7 @@ static std::string getErrorString(const
   std::string Str = (Warning ? "warning" : "error");
   Str += ": ";
   if (!Whence.empty())
-    Str += Whence;
+    Str += Whence.str() + ": ";
   Str += Message.str() + "\n";
   return Str;
 }
@@ -504,7 +504,7 @@ int CodeCoverageTool::show(int argc, con
   if (!Filters.empty()) {
     auto OSOrErr = Printer->createViewFile("functions", /*InToplevel=*/true);
     if (Error E = OSOrErr.takeError()) {
-      error(toString(std::move(E)));
+      error("Could not create view file!", toString(std::move(E)));
       return 1;
     }
     auto OS = std::move(OSOrErr.get());
@@ -540,7 +540,7 @@ int CodeCoverageTool::show(int argc, con
   // Create an index out of the source files.
   if (ViewOpts.hasOutputDirectory()) {
     if (Error E = Printer->createIndexFile(SourceFiles)) {
-      error(toString(std::move(E)));
+      error("Could not create index file!", toString(std::move(E)));
       return 1;
     }
   }
@@ -561,7 +561,7 @@ int CodeCoverageTool::show(int argc, con
 
       auto OSOrErr = Printer->createViewFile(SourceFile, /*InToplevel=*/false);
       if (Error E = OSOrErr.takeError()) {
-        deferError(toString(std::move(E)));
+        deferError("Could not create view file!", toString(std::move(E)));
         return;
       }
       auto OS = std::move(OSOrErr.get());