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/mgrconfig | |
| 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/mgrconfig')
| -rw-r--r-- | pkg/mgrconfig/config.go | 2 | ||||
| -rw-r--r-- | pkg/mgrconfig/load.go | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/mgrconfig/config.go b/pkg/mgrconfig/config.go index 48609d5c4..a023803ef 100644 --- a/pkg/mgrconfig/config.go +++ b/pkg/mgrconfig/config.go @@ -24,6 +24,8 @@ type Config struct { KernelObj string `json:"kernel_obj"` // Kernel source directory (if not set defaults to KernelObj). KernelSrc string `json:"kernel_src,omitempty"` + // Location of the driectory where the kernel was built (if not set defaults to KernelSrc) + KernelBuildSrc string `json:"kernel_build_src"` // Arbitrary optional tag that is saved along with crash reports (e.g. branch/commit). Tag string `json:"tag,omitempty"` // Location of the disk image file. diff --git a/pkg/mgrconfig/load.go b/pkg/mgrconfig/load.go index 1fdcc0155..a4cbc8914 100644 --- a/pkg/mgrconfig/load.go +++ b/pkg/mgrconfig/load.go @@ -111,6 +111,9 @@ func Complete(cfg *Config) error { cfg.KernelSrc = cfg.KernelObj // assume in-tree build by default } cfg.KernelSrc = osutil.Abs(cfg.KernelSrc) + if cfg.KernelBuildSrc == "" { + cfg.KernelBuildSrc = cfg.KernelSrc + } if cfg.HubClient != "" && (cfg.Name == "" || cfg.HubAddr == "" || cfg.HubKey == "") { return fmt.Errorf("hub_client is set, but name/hub_addr/hub_key is empty") } |