projects / platform / upstream / llvm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 095f5b2)
[llvm-cov] Don't copy stylesheets into index files
authorVedant Kumar <vsk@apple.com>
Fri, 22 Jul 2016 20:49:23 +0000 (20:49 +0000)
committerVedant Kumar <vsk@apple.com>
Fri, 22 Jul 2016 20:49:23 +0000 (20:49 +0000)
Just link in the stylesheet from the toplevel dir of the report.

llvm-svn: 276468

llvm/test/tools/llvm-cov/style.test patch | blob | history
llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp patch | blob | history

diff --git a/llvm/test/tools/llvm-cov/style.test b/llvm/test/tools/llvm-cov/style.test
index 253cde3..543d508 100644 (file)
--- a/llvm/test/tools/llvm-cov/style.test
+++ b/llvm/test/tools/llvm-cov/style.test
@@ -5,7 +5,8 @@ RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S
 RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %S/Inputs/templateInstantiations.profdata -filename-equivalence %S/showTemplateInstantiations.cpp -format html | FileCheck %s -check-prefix=NODIR
 
 RUN: FileCheck %s -input-file=%t.dir/style.css -check-prefix=STYLE
-RUN: FileCheck %s -input-file=%t.dir/functions.html -check-prefix=FUNCTIONS
+RUN: FileCheck %s -input-file=%t.dir/functions.html -check-prefix=TOPLEVEL
+RUN: FileCheck %s -input-file=%t.dir/index.html -check-prefix=TOPLEVEL
 RUN: FileCheck %s -input-file=%t.dir/coverage/tmp/showTemplateInstantiations.cpp.html -check-prefix=FILEVIEW
 
 STYLE-DAG: .red
@@ -19,10 +20,10 @@ STYLE-DAG: .uncovered-line
 STYLE-DAG: .tooltip
 STYLE-DAG: .tooltip span.tooltip-content
 
-FUNCTIONS-NOT: <style>
-FUNCTIONS: <head>
-FUNCTIONS: <link rel='stylesheet' type='text/css' href='style.css'>
-FUNCTIONS: </head>
+TOPLEVEL-NOT: <style>
+TOPLEVEL: <head>
+TOPLEVEL: <link rel='stylesheet' type='text/css' href='style.css'>
+TOPLEVEL: </head>
 
 FILEVIEW-NOT: <style>
 FILEVIEW: <head>
diff --git a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp
index ceab556..ef81cea 100644 (file)
--- a/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp
+++ b/llvm/tools/llvm-cov/SourceCoverageViewHTML.cpp
@@ -247,7 +247,8 @@ Error CoveragePrinterHTML::createIndexFile(ArrayRef<StringRef> SourceFiles) {
   raw_ostream &OSRef = *OS.get();
 
   // Emit a table containing links to reports for each file in the covmapping.
-  emitPrelude(OSRef);
+  assert(Opts.hasOutputDirectory() && "No output directory for index file");
+  emitPrelude(OSRef, getPathToStyle(""));
   OSRef << BeginSourceNameDiv << "Index" << EndSourceNameDiv;
   OSRef << BeginTable;
   for (StringRef SF : SourceFiles) {
Domain: System / Toolchain;