diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-04-09 09:49:39 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-04-09 08:33:12 +0000 |
| commit | 56086b24bdfd822d3b227edb3064db443cd8c971 (patch) | |
| tree | fc307b5a2332cb85d0b8804e9d2645450da10853 /pkg/cover/backend | |
| parent | da07505f2b87b144347aa19597979d340b134b06 (diff) | |
pkg/cover: don't duplicate broken kcov logic in the test
dwarf.go already detects if kcov is broken and need to provide this bit
for the check in report.go, so just use this bit in the test as well.
Diffstat (limited to 'pkg/cover/backend')
| -rw-r--r-- | pkg/cover/backend/dwarf.go | 6 | ||||
| -rw-r--r-- | pkg/cover/backend/dwarf_test.go | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/pkg/cover/backend/dwarf.go b/pkg/cover/backend/dwarf.go index b13ba2ca8..331cab9e3 100644 --- a/pkg/cover/backend/dwarf.go +++ b/pkg/cover/backend/dwarf.go @@ -189,7 +189,7 @@ func makeDWARFUnsafe(params *dwarfParams) (*Impl, error) { } allRanges = append(allRanges, ranges...) allUnits = append(allUnits, units...) - if IsKcovBrokenInCompiler(params.getCompilerVersion(module.Path)) { + if isKcovBrokenInCompiler(params.getCompilerVersion(module.Path)) { preciseCoverage = false } } @@ -304,7 +304,7 @@ func buildSymbols(symbols []*Symbol, ranges []pcRange, coverPoints [2][]uint64) return symbols } -// Regexps to parse compiler version string in IsKcovBrokenInCompiler. +// Regexps to parse compiler version string in isKcovBrokenInCompiler. // Some targets (e.g. NetBSD) use g++ instead of gcc. var gccRE = regexp.MustCompile(`gcc|GCC|g\+\+`) var gccVersionRE = regexp.MustCompile(`(gcc|GCC|g\+\+).* ([0-9]{1,2})\.[0-9]+\.[0-9]+`) @@ -312,7 +312,7 @@ var gccVersionRE = regexp.MustCompile(`(gcc|GCC|g\+\+).* ([0-9]{1,2})\.[0-9]+\.[ // GCC < 14 incorrectly tail-calls kcov callbacks, which does not let syzkaller // verify that collected coverage points have matching callbacks. // See https://github.com/google/syzkaller/issues/4447 for more information. -func IsKcovBrokenInCompiler(versionStr string) bool { +func isKcovBrokenInCompiler(versionStr string) bool { if !gccRE.MatchString(versionStr) { return false } diff --git a/pkg/cover/backend/dwarf_test.go b/pkg/cover/backend/dwarf_test.go index bc2ebf12e..9d4da8e90 100644 --- a/pkg/cover/backend/dwarf_test.go +++ b/pkg/cover/backend/dwarf_test.go @@ -26,15 +26,13 @@ func TestIsKcovBrokenInCompiler(t *testing.T) { "g++ (Compiler-Explorer-Build-gcc-2a9637b229f64775d82fb5917f83f71e8ad1911d-binutils-2.40) 14.0.1 20240125 (experimental)", // nolint:lll } for _, ver := range inputDataTrue { - result := IsKcovBrokenInCompiler(ver) - if !result { - t.Fatalf("IsKcovBrokenInCompiler(`%s`) unexpectedly returned %v\n", ver, result) + if !isKcovBrokenInCompiler(ver) { + t.Fatalf("isKcovBrokenInCompiler(%q) unexpectedly returned false\n", ver) } } for _, ver := range inputDataFalse { - result := IsKcovBrokenInCompiler(ver) - if result { - t.Fatalf("IsKcovBrokenInCompiler(`%s`) unexpectedly returned %v\n", ver, result) + if isKcovBrokenInCompiler(ver) { + t.Fatalf("isKcovBrokenInCompiler(%q) unexpectedly returned true\n", ver) } } } |
