wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7628 from sfc-gh-mpilman/features/code-coverage-test-harness 

Change test harness to include comments
This commit is contained in:
Markus Pilman 2022-07-28 13:54:21 -06:00 committed by GitHub
parent 83e94781b4 92b1d1f647
commit ade9d20780
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/TestHarness/Program.cs
View File

@ -789,7 +789,7 @@ namespace SummarizeTest
int stderrSeverity = (int)Magnesium.Severity.SevError;
Dictionary<KeyValuePair<string, Magnesium.Severity>, Magnesium.Severity> severityMap = new Dictionary<KeyValuePair<string, Magnesium.Severity>, Magnesium.Severity>();
Dictionary<Tuple<string, string>, bool> codeCoverage = new Dictionary<Tuple<string, string>, bool>();
var codeCoverage = new Dictionary<Tuple<string, string, string>, bool>();
foreach (var traceFileName in traceFiles)
{
@ -902,12 +902,17 @@ namespace SummarizeTest
if (ev.Type == "CodeCoverage" && !willRestart)
{
bool covered = true;
if(ev.DDetails.ContainsKey("Covered"))
if (ev.DDetails.ContainsKey("Covered"))
{
covered = int.Parse(ev.Details.Covered) != 0;
}
var key = new Tuple<string, string>(ev.Details.File, ev.Details.Line);
var comment = "";
if (ev.DDetails.ContainsKey("Comment"))
{
comment = ev.Details.Comment;
}
var key = new Tuple<string, string, string>(ev.Details.File, ev.Details.Line, comment);
if (covered || !codeCoverage.ContainsKey(key))
{
codeCoverage[key] = covered;
@ -961,6 +966,9 @@ namespace SummarizeTest
{
element.Add(new XAttribute("Covered", "0"));
}
if (kv.Key.Item3.Length > 0) {
element.Add(new XAttribute("Comment", kv.Key.Item3));
}
xout.Add(element);
}

2
flow/include/flow/CodeProbe.h
View File

@ -228,7 +228,7 @@ struct CodeProbeImpl : ICodeProbe {
evt.detail("File", filename())
.detail("Line", Line)
.detail("Condition", Condition::value())
.detail("ProbeHit", condition)
.detail("Covered", condition)
.detail("Comment", Comment::value());
annotations.trace(this, evt, condition);
}