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 /tools | |
| 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 'tools')
| -rw-r--r-- | tools/syz-cover/syz-cover.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/syz-cover/syz-cover.go b/tools/syz-cover/syz-cover.go index d30a1bb71..fbeb1f90b 100644 --- a/tools/syz-cover/syz-cover.go +++ b/tools/syz-cover/syz-cover.go @@ -34,10 +34,11 @@ import ( func main() { var ( - flagOS = flag.String("os", runtime.GOOS, "target os") - flagArch = flag.String("arch", runtime.GOARCH, "target arch") - flagKernelSrc = flag.String("kernel_src", "", "path to kernel sources") - flagKernelObj = flag.String("kernel_obj", "", "path to kernel build/obj dir") + flagOS = flag.String("os", runtime.GOOS, "target os") + flagArch = flag.String("arch", runtime.GOARCH, "target arch") + flagKernelSrc = flag.String("kernel_src", "", "path to kernel sources") + flagKernelBuildSrc = flag.String("kernel_build_src", "", "path to kernel image's build dir (optional)") + flagKernelObj = flag.String("kernel_obj", "", "path to kernel build/obj dir") ) flag.Parse() @@ -52,6 +53,9 @@ func main() { if *flagKernelObj == "" { *flagKernelObj = *flagKernelSrc } + if *flagKernelBuildSrc == "" { + *flagKernelBuildSrc = *flagKernelSrc + } target := targets.Get(*flagOS, *flagArch) if target == nil { failf("unknown target %v/%v", *flagOS, *flagArch) @@ -61,7 +65,7 @@ func main() { failf("%v", err) } kernelObj := filepath.Join(*flagKernelObj, target.KernelObject) - rg, err := cover.MakeReportGenerator(kernelObj, *flagKernelSrc, *flagArch) + rg, err := cover.MakeReportGenerator(kernelObj, *flagKernelSrc, *flagKernelBuildSrc, *flagArch) if err != nil { failf("%v", err) } |