<div dir="ltr">Thanks Galina, I'm taking a look right now!<div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 31, 2018 at 11:32 AM, Galina Kistanova <span dir="ltr"><<a href="mailto:gkistanova@gmail.com" target="_blank">gkistanova@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hello Max,<br><br>It look like this commits added broken tests to one of our builders:<br><a href="http://lab.llvm.org:8011/builders/llvm-clang-x86_64-expensive-checks-win/builds/7639" target="_blank">http://lab.llvm.org:8011/<wbr>builders/llvm-clang-x86_64-<wbr>expensive-checks-win/builds/<wbr>7639</a><br><br>. . .<br>Failing Tests (5):<br> Clang :: CodeGenOpenCL/<a href="http://builtins-amdgcn-vi.cl" target="_blank">builtins-amdgcn-<wbr>vi.cl</a><br> LLVM :: CodeGen/AArch64/machine-<wbr>outliner.mir<br> LLVM :: tools/llvm-cov/dir-with-<wbr>filtering.test<br> LLVM :: tools/llvm-cov/<wbr>hideUnexecutedSubviews.test<br> LLVM :: tools/llvm-cov/<wbr>showLineExecutionCounts.cpp<br><br>The builder was already red and did not send notifications on the changes.<br>Please have a look?<br><br>Thanks<br><br>Galina<br></div><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Jan 31, 2018 at 9:37 AM, Max Moroz via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: dor1s<br>
Date: Wed Jan 31 09:37:21 2018<br>
New Revision: 323892<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=323892&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=323892&view=rev</a><br>
Log:<br>
[llvm-cov] Improvements for summary report generated in HTML format.<br>
<br>
Summary:<br>
This commit adds the following changes:<br>
<br>
1) coverage numbers are aligned to the left and padded with spaces in order to<br>
provide better readability for percentage values, e.g.:<br>
<br>
```<br>
file1 | 89.13% (123 / 2323) | 100.00% (55 / 55) | 9.33% (14545 / 234234)<br>
file_asda | 1.78% ( 23 / 4323) | 32.31% (555 / 6555) | 67.89% (1545 / 2234)<br>
fileXXX | 100.00% (12323 / 12323) | 100.00% (555 / 555) | 100.00% (12345 / 12345)<br>
```<br>
<br>
2) added "hover" attribute to CSS for highlighting table row under mouse cursor<br>
see screenshot attached to the phabricator review page<br>
<br>
{F5764813}<br>
<br>
3) table title row and "totals" row now use bold text<br>
<br>
Reviewers: vsk, morehouse<br>
<br>
Reviewed By: vsk<br>
<br>
Subscribers: kcc, llvm-commits<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D42093" rel="noreferrer" target="_blank">https://reviews.llvm.org/D4209<wbr>3</a><br>
<br>
Modified:<br>
llvm/trunk/test/tools/llvm-cov<wbr>/hideUnexecutedSubviews.test<br>
llvm/trunk/test/tools/llvm-cov<wbr>/showLineExecutionCounts.cpp<br>
llvm/trunk/test/tools/llvm-cov<wbr>/style.test<br>
llvm/trunk/tools/llvm-cov/Sour<wbr>ceCoverageViewHTML.cpp<br>
<br>
Modified: llvm/trunk/test/tools/llvm-cov<wbr>/hideUnexecutedSubviews.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/hideUnexecutedSubviews.test?rev=323892&r1=323891&r2=323892&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/tools/ll<wbr>vm-cov/hideUnexecutedSubviews.<wbr>test?rev=323892&r1=323891&r2=3<wbr>23892&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/tools/llvm-cov<wbr>/hideUnexecutedSubviews.test (original)<br>
+++ llvm/trunk/test/tools/llvm-cov<wbr>/hideUnexecutedSubviews.test Wed Jan 31 09:37:21 2018<br>
@@ -11,11 +11,11 @@ FILE-NOT: Unexecuted instantiation<br>
<br>
RUN: FileCheck -check-prefix=INDEX %s -input-file %t.html.dir/index.html<br>
<br>
-INDEX: <td class='column-entry-left'>File<wbr>name</td><br>
-INDEX: <td class='column-entry'>Function Coverage</td><br>
-INDEX: <td class='column-entry'>Instantia<wbr>tion Coverage</td><br>
-INDEX: <td class='column-entry'>Line Coverage</td><br>
-INDEX: <td class='column-entry'>Region Coverage</td><br>
+INDEX: <td class='column-entry-bold'>File<wbr>name</td><br>
+INDEX: <td class='column-entry-bold'>Func<wbr>tion Coverage</td><br>
+INDEX: <td class='column-entry-bold'>Inst<wbr>antiation Coverage</td><br>
+INDEX: <td class='column-entry-bold'>Line Coverage</td><br>
+INDEX: <td class='column-entry-bold'>Regi<wbr>on Coverage</td><br>
INDEX: <td class='column-entry-red'><br>
INDEX: 50.00% (1/2)<br>
INDEX: <td class='column-entry-red'><br>
<br>
Modified: llvm/trunk/test/tools/llvm-cov<wbr>/showLineExecutionCounts.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/showLineExecutionCounts.cpp?rev=323892&r1=323891&r2=323892&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/tools/ll<wbr>vm-cov/showLineExecutionCounts<wbr>.cpp?rev=323892&r1=323891&r2=3<wbr>23892&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/tools/llvm-cov<wbr>/showLineExecutionCounts.cpp (original)<br>
+++ llvm/trunk/test/tools/llvm-cov<wbr>/showLineExecutionCounts.cpp Wed Jan 31 09:37:21 2018<br>
@@ -62,10 +62,10 @@ int main() {<br>
//<br>
// RUN: FileCheck -check-prefix HTML-INDEX -input-file %t.html.dir/index.html %s<br>
// HTML-INDEX-LABEL: <table><br>
-// HTML-INDEX: <td class='column-entry-left'>File<wbr>name</td><br>
-// HTML-INDEX: <td class='column-entry'>Function Coverage</td><br>
-// HTML-INDEX: <td class='column-entry'>Line Coverage</td><br>
-// HTML-INDEX: <td class='column-entry'>Region Coverage</td><br>
+// HTML-INDEX: <td class='column-entry-bold'>File<wbr>name</td><br>
+// HTML-INDEX: <td class='column-entry-bold'>Func<wbr>tion Coverage</td><br>
+// HTML-INDEX: <td class='column-entry-bold'>Line Coverage</td><br>
+// HTML-INDEX: <td class='column-entry-bold'>Regi<wbr>on Coverage</td><br>
// HTML-INDEX: <a href='coverage{{.*}}showLineEx<wbr>ecutionCounts.cpp.html'{{.*}}s<wbr>howLineExecutionCounts.cpp</a><br>
// HTML-INDEX: <td class='column-entry-green'><br>
// HTML-INDEX: 100.00% (1/1)<br>
@@ -73,4 +73,5 @@ int main() {<br>
// HTML-INDEX: 90.00% (18/20)<br>
// HTML-INDEX: <td class='column-entry-red'><br>
// HTML-INDEX: 72.73% (8/11)<br>
-// HTML-INDEX: TOTALS<br>
+// HTML-INDEX: <tr class='light-row-bold'><br>
+// HTML-INDEX: Totals<br>
<br>
Modified: llvm/trunk/test/tools/llvm-cov<wbr>/style.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-cov/style.test?rev=323892&r1=323891&r2=323892&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/test/tools/ll<wbr>vm-cov/style.test?rev=323892&<wbr>r1=323891&r2=323892&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/test/tools/llvm-cov<wbr>/style.test (original)<br>
+++ llvm/trunk/test/tools/llvm-cov<wbr>/style.test Wed Jan 31 09:37:21 2018<br>
@@ -19,15 +19,23 @@ STYLE-DAG: .centered<br>
STYLE-DAG: .expansion-view<br>
STYLE-DAG: .line-number<br>
STYLE-DAG: .light-row<br>
+STYLE-DAG: .light-row-bold<br>
STYLE-DAG: .column-entry<br>
-STYLE-DAG: .column-entry-left<br>
+STYLE-DAG: .column-entry-bold<br>
STYLE-DAG: .column-entry-yellow<br>
+STYLE-DAG: .column-entry-yellow:hover<br>
STYLE-DAG: .column-entry-red<br>
+STYLE-DAG: .column-entry-red:hover<br>
STYLE-DAG: .column-entry-green<br>
+STYLE-DAG: .column-entry-green:hover<br>
STYLE-DAG: .covered-line<br>
STYLE-DAG: .uncovered-line<br>
STYLE-DAG: .tooltip<br>
STYLE-DAG: .tooltip span.tooltip-content<br>
+STYLE-DAG: th, td<br>
+STYLE-DAG: td:first-child<br>
+STYLE-DAG: td:last-child<br>
+STYLE-DAG: tr:hover<br>
<br>
TOPLEVEL-NOT: <style><br>
TOPLEVEL: <head><br>
<br>
Modified: llvm/trunk/tools/llvm-cov/Sour<wbr>ceCoverageViewHTML.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-cov/SourceCoverageViewHTML.cpp?rev=323892&r1=323891&r2=323892&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/llvm/trunk/tools/llvm-co<wbr>v/SourceCoverageViewHTML.cpp?<wbr>rev=323892&r1=323891&r2=323892<wbr>&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- llvm/trunk/tools/llvm-cov/Sour<wbr>ceCoverageViewHTML.cpp (original)<br>
+++ llvm/trunk/tools/llvm-cov/Sour<wbr>ceCoverageViewHTML.cpp Wed Jan 31 09:37:21 2018<br>
@@ -116,24 +116,39 @@ table {<br>
background: #ffffff;<br>
border: 1px solid #dbdbdb;<br>
}<br>
+.light-row-bold {<br>
+ background: #ffffff;<br>
+ border: 1px solid #dbdbdb;<br>
+ font-weight: bold;<br>
+}<br>
.column-entry {<br>
- text-align: right;<br>
+ text-align: left;<br>
}<br>
-.column-entry-left {<br>
+.column-entry-bold {<br>
+ font-weight: bold;<br>
text-align: left;<br>
}<br>
.column-entry-yellow {<br>
- text-align: right;<br>
+ text-align: left;<br>
background-color: #ffffd0;<br>
}<br>
+.column-entry-yellow:hover {<br>
+ background-color: #fffff0;<br>
+}<br>
.column-entry-red {<br>
- text-align: right;<br>
+ text-align: left;<br>
background-color: #ffd0d0;<br>
}<br>
+.column-entry-red:hover {<br>
+ background-color: #fff0f0;<br>
+}<br>
.column-entry-green {<br>
- text-align: right;<br>
+ text-align: left;<br>
background-color: #d0ffd0;<br>
}<br>
+.column-entry-green:hover {<br>
+ background-color: #f0fff0;<br>
+}<br>
.line-number {<br>
text-align: right;<br>
color: #aaa;<br>
@@ -184,10 +199,11 @@ table {<br>
}<br>
th, td {<br>
vertical-align: top;<br>
- padding: 2px 5px;<br>
+ padding: 2px 8px;<br>
border-collapse: collapse;<br>
border-right: solid 1px #eee;<br>
border-left: solid 1px #eee;<br>
+ text-align: left;<br>
}<br>
td:first-child {<br>
border-left: none;<br>
@@ -195,6 +211,9 @@ td:first-child {<br>
td:last-child {<br>
border-right: none;<br>
}<br>
+tr:hover {<br>
+ background-color: #f0f0f0;<br>
+}<br>
)";<br>
<br>
const char *EndHeader = "</head>";<br>
@@ -287,13 +306,14 @@ void CoveragePrinterHTML::closeView<wbr>File(<br>
static void emitColumnLabelsForIndex(raw_o<wbr>stream &OS,<br>
const CoverageViewOptions &Opts) {<br>
SmallVector<std::string, 4> Columns;<br>
- Columns.emplace_back(tag("td", "Filename", "column-entry-left"));<br>
- Columns.emplace_back(tag("td", "Function Coverage", "column-entry"));<br>
+ Columns.emplace_back(tag("td", "Filename", "column-entry-bold"));<br>
+ Columns.emplace_back(tag("td", "Function Coverage", "column-entry-bold"));<br>
if (Opts.ShowInstantiationSummary<wbr>)<br>
- Columns.emplace_back(tag("td", "Instantiation Coverage", "column-entry"));<br>
- Columns.emplace_back(tag("td", "Line Coverage", "column-entry"));<br>
+ Columns.emplace_back(<br>
+ tag("td", "Instantiation Coverage", "column-entry-bold"));<br>
+ Columns.emplace_back(tag("td", "Line Coverage", "column-entry-bold"));<br>
if (Opts.ShowRegionSummary)<br>
- Columns.emplace_back(tag("td", "Region Coverage", "column-entry"));<br>
+ Columns.emplace_back(tag("td", "Region Coverage", "column-entry-bold"));<br>
OS << tag("tr", join(Columns.begin(), Columns.end(), ""));<br>
}<br>
<br>
@@ -323,7 +343,7 @@ void CoveragePrinterHTML::emitFileS<wbr>ummar<br>
{<br>
raw_string_ostream RSO{S};<br>
if (Total)<br>
- RSO << format("%*.2f", 7, Pctg) << "% ";<br>
+ RSO << format("%6.2f", 7, Pctg) << "% ";<br>
else<br>
RSO << "- ";<br>
RSO << '(' << Hit << '/' << Total << ')';<br>
@@ -339,7 +359,7 @@ void CoveragePrinterHTML::emitFileS<wbr>ummar<br>
// Simplify the display file path, and wrap it in a link if requested.<br>
std::string Filename;<br>
if (IsTotals) {<br>
- Filename = "TOTALS";<br>
+ Filename = SF;<br>
} else {<br>
Filename = buildLinkToFile(SF, FCS);<br>
}<br>
@@ -360,7 +380,10 @@ void CoveragePrinterHTML::emitFileS<wbr>ummar<br>
FCS.RegionCoverage.getNumRegi<wbr>ons(),<br>
FCS.RegionCoverage.getPercent<wbr>Covered());<br>
<br>
- OS << tag("tr", join(Columns.begin(), Columns.end(), ""), "light-row");<br>
+ if (IsTotals)<br>
+ OS << tag("tr", join(Columns.begin(), Columns.end(), ""), "light-row-bold");<br>
+ else<br>
+ OS << tag("tr", join(Columns.begin(), Columns.end(), ""), "light-row");<br>
}<br>
<br>
Error CoveragePrinterHTML::createInd<wbr>exFile(<br>
<br>
<br>
______________________________<wbr>_________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>
</blockquote></div><br></div></div>