From e6e35dba937599d098fc034eff2686e5ddc409e9 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 26 Oct 2020 10:51:06 +0100 Subject: sys/targets: add OS/Arch name consts We use strings to identify OS/Arch. These strings are duplicated throughout the code base massively. golangci-lint points to possiblity of typos and duplication. We already had to define these names in pkg/csource and disable checking for prog package. A future change triggers such warnings in another package. Add OS/Arch name consts to sys/targets so that they can be used to refer to OS/Arch. Use the consts everywhere. --- pkg/report/fuzz.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkg/report/fuzz.go') diff --git a/pkg/report/fuzz.go b/pkg/report/fuzz.go index 0db602491..f812f78eb 100644 --- a/pkg/report/fuzz.go +++ b/pkg/report/fuzz.go @@ -7,6 +7,7 @@ import ( "fmt" "github.com/google/syzkaller/pkg/mgrconfig" + "github.com/google/syzkaller/sys/targets" ) func Fuzz(data []byte) int { @@ -32,7 +33,7 @@ func Fuzz(data []byte) int { if len(rep.Output) == 0 { panic(fmt.Sprintf("%v: len(Output) == 0", typ)) } - if os == "fuchsia" { + if os == targets.Fuchsia { // Fuchsia has Start/End/SkipPos set incorrectly because it symbolizes before parsing. continue } @@ -66,12 +67,12 @@ func Fuzz(data []byte) int { var fuzzReporters = func() map[string]Reporter { reporters := make(map[string]Reporter) for os := range ctors { - if os == "windows" { + if os == targets.Windows { continue } cfg := &mgrconfig.Config{ TargetOS: os, - TargetArch: "amd64", + TargetArch: targets.AMD64, } reporter, err := NewReporter(cfg) if err != nil { -- cgit mrf-deployment