diff options
| author | Taras Madan <tarasmadan@google.com> | 2024-08-15 09:01:26 +0200 |
|---|---|---|
| committer | Taras Madan <tarasmadan@google.com> | 2024-08-16 08:46:09 +0000 |
| commit | e1c76ab230ba9925a55290523b8ec832399f9ba3 (patch) | |
| tree | c42434c328cddad4919aef9bc2d76829a5de287c /pkg/covermerger | |
| parent | e4bacdaf3417006ad6aa0d911a44b49bb25a6e1a (diff) | |
pkg/covermerger: fix merge bug
Diffstat (limited to 'pkg/covermerger')
| -rw-r--r-- | pkg/covermerger/file_line_merger.go | 2 | ||||
| -rw-r--r-- | pkg/covermerger/testdata/integration/aesni-intel_glue/merge_result.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/covermerger/file_line_merger.go b/pkg/covermerger/file_line_merger.go index 04b437130..5e04a76da 100644 --- a/pkg/covermerger/file_line_merger.go +++ b/pkg/covermerger/file_line_merger.go @@ -48,7 +48,7 @@ func (a *FileLineCoverMerger) AddRecord(rbc RepoBranchCommit, f *Frame, hitCount return } if targetLine := a.matchers[rbc].SameLinePos(f.StartLine); targetLine != -1 { - a.hitCounts[f.StartLine] += hitCount + a.hitCounts[targetLine] += hitCount } } diff --git a/pkg/covermerger/testdata/integration/aesni-intel_glue/merge_result.txt b/pkg/covermerger/testdata/integration/aesni-intel_glue/merge_result.txt index c5e34d788..45a52bf65 100644 --- a/pkg/covermerger/testdata/integration/aesni-intel_glue/merge_result.txt +++ b/pkg/covermerger/testdata/integration/aesni-intel_glue/merge_result.txt @@ -2,7 +2,7 @@ "arch/x86/crypto/aesni-intel_glue.c": { "HitCounts":{ - "1002":5,"1145":58,"1148":58,"1149":58,"1400":28,"1404":28,"1424":4,"1435":4,"228":5,"231":106,"233":64,"236":0,"240":53,"241":0,"243":111,"245":53,"252":4,"253":0,"254":0,"285":4,"358":4,"375":4,"382":4,"397":4,"420":4,"424":5,"426":4,"491":5,"510":4,"517":5,"520":5,"539":4,"605":28,"607":58,"615":4,"649":25,"651":53,"705":4,"721":4,"723":5,"725":4,"729":5,"738":10,"763":4,"816":4,"886":5,"893":5,"898":8,"904":5,"913":5,"945":5,"951":5,"953":4,"956":5,"964":5 + "1002":5,"1145":86,"1148":58,"1149":86,"1169":4,"1180":4,"228":5,"231":106,"233":64,"236":0,"240":53,"241":0,"243":111,"245":53,"253":0,"254":4,"287":4,"358":4,"375":4,"382":4,"399":4,"420":4,"426":9,"493":5,"510":4,"519":5,"522":5,"539":4,"607":86,"617":4,"651":78,"707":4,"723":9,"727":4,"729":5,"738":10,"765":4,"818":4,"886":5,"893":5,"898":8,"904":5,"913":5,"945":5,"951":5,"953":4,"956":5,"964":5 }, "FileExists": true } |