diff options
| author | Siddharth M <siddharth.muralee@gmail.com> | 2019-07-17 15:28:23 +0530 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2019-07-17 11:58:23 +0200 |
| commit | f613a7c41d0b3ea16eeaad515e44dec003688ffb (patch) | |
| tree | 5ee7c4e7ce4539636f078c2add6b981df8c01203 /pkg/report/openbsd.go | |
| parent | 0d10349cf0b4a9f98490378709bd9a83bd0042d6 (diff) | |
pkg/cover: fix prefix computation
* pkg/cover: Modify parsing logic
1. Remove prefix computation
2. Add a mgrconfig for kernel build directory
* pkg/report: shorten reports with kernelBuildSrc instead of kernelSrc
* pkg/report: Fix failing tests
* pkg/report: fix formating issues
* tools/syz-cover: Fix unintended redefinition
* make changes to fix failing ci build
* pkg/report: fix issues
Diffstat (limited to 'pkg/report/openbsd.go')
| -rw-r--r-- | pkg/report/openbsd.go | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/pkg/report/openbsd.go b/pkg/report/openbsd.go index 4bd47f865..7a0c318a5 100644 --- a/pkg/report/openbsd.go +++ b/pkg/report/openbsd.go @@ -17,11 +17,12 @@ import ( ) type openbsd struct { - kernelSrc string - kernelObj string - kernelObject string - symbols map[string][]symbolizer.Symbol - ignores []*regexp.Regexp + kernelSrc string + kernelBuildSrc string + kernelObj string + kernelObject string + symbols map[string][]symbolizer.Symbol + ignores []*regexp.Regexp } var ( @@ -33,7 +34,7 @@ var ( } ) -func ctorOpenbsd(target *targets.Target, kernelSrc, kernelObj string, +func ctorOpenbsd(target *targets.Target, kernelSrc, kernelBuildSrc, kernelObj string, ignores []*regexp.Regexp) (Reporter, []string, error) { var symbols map[string][]symbolizer.Symbol kernelObject := "" @@ -46,11 +47,12 @@ func ctorOpenbsd(target *targets.Target, kernelSrc, kernelObj string, } } ctx := &openbsd{ - kernelSrc: kernelSrc, - kernelObj: kernelObj, - kernelObject: kernelObject, - symbols: symbols, - ignores: ignores, + kernelSrc: kernelSrc, + kernelBuildSrc: kernelBuildSrc, + kernelObj: kernelObj, + kernelObject: kernelObject, + symbols: symbols, + ignores: ignores, } return ctx, nil, nil } @@ -124,7 +126,7 @@ func (ctx *openbsd) symbolizeLine(symbFunc func(bin string, pc uint64) ([]symbol var symbolized []byte for _, frame := range frames { file := frame.File - file = strings.TrimPrefix(file, ctx.kernelSrc) + file = strings.TrimPrefix(file, ctx.kernelBuildSrc) file = strings.TrimPrefix(file, "/") info := fmt.Sprintf(" %v:%v", file, frame.Line) modified := append([]byte{}, line...) |