[llvm] r296487 - [llvm-cov] Error-out when an unsupported format is used (PR32087)

Vedant Kumar via llvm-commits llvm-commits at lists.llvm.org
Tue Feb 28 08:57:29 PST 2017


Author: vedantk
Date: Tue Feb 28 10:57:28 2017
New Revision: 296487

URL: http://llvm.org/viewvc/llvm-project?rev=296487&view=rev
Log:
[llvm-cov] Error-out when an unsupported format is used (PR32087)

Modified:
    llvm/trunk/test/tools/llvm-cov/warnings.h
    llvm/trunk/tools/llvm-cov/CodeCoverage.cpp

Modified: llvm/trunk/test/tools/llvm-cov/warnings.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/warnings.h?rev=296487&r1=296486&r2=296487&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-cov/warnings.h (original)
+++ llvm/trunk/test/tools/llvm-cov/warnings.h Tue Feb 28 10:57:28 2017
@@ -1,5 +1,7 @@
 // RUN: llvm-cov show %S/Inputs/prevent_false_instantiations.covmapping -instr-profile %S/Inputs/elf_binary_comdat.profdata -filename-equivalence /dev/null | FileCheck %s -allow-empty -check-prefix=FAKE-FILE-STDOUT
 // RUN: llvm-cov show %S/Inputs/prevent_false_instantiations.covmapping -instr-profile %S/Inputs/elf_binary_comdat.profdata -filename-equivalence /dev/null 2>&1 | FileCheck %s -check-prefix=FAKE-FILE-STDERR
+// RUN: not llvm-cov report %S/Inputs/prevent_false_instantiations.covmapping -instr-profile %S/Inputs/elf_binary_comdat.profdata -format=html
+// RUN: not llvm-cov export %S/Inputs/prevent_false_instantiations.covmapping -instr-profile %S/Inputs/elf_binary_comdat.profdata -format=html
 
 // FAKE-FILE-STDOUT-NOT: warning: The file '{{.*}}' isn't covered.
 // FAKE-FILE-STDERR: warning: The file '{{.*}}' isn't covered.

Modified: llvm/trunk/tools/llvm-cov/CodeCoverage.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cov/CodeCoverage.cpp?rev=296487&r1=296486&r2=296487&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-cov/CodeCoverage.cpp (original)
+++ llvm/trunk/tools/llvm-cov/CodeCoverage.cpp Tue Feb 28 10:57:28 2017
@@ -818,8 +818,10 @@ int CodeCoverageTool::report(int argc, c
   if (Err)
     return Err;
 
-  if (ViewOpts.Format == CoverageViewOptions::OutputFormat::HTML)
+  if (ViewOpts.Format == CoverageViewOptions::OutputFormat::HTML) {
     error("HTML output for summary reports is not yet supported.");
+    return 1;
+  }
 
   auto Coverage = load();
   if (!Coverage)
@@ -840,6 +842,11 @@ int CodeCoverageTool::export_(int argc,
   if (Err)
     return Err;
 
+  if (ViewOpts.Format != CoverageViewOptions::OutputFormat::Text) {
+    error("Coverage data can only be exported as textual JSON.");
+    return 1;
+  }
+
   auto Coverage = load();
   if (!Coverage) {
     error("Could not load coverage information");




More information about the llvm-commits mailing list