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/vcs/vcs.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'pkg/vcs') diff --git a/pkg/vcs/vcs.go b/pkg/vcs/vcs.go index 4185bf165..df3099225 100644 --- a/pkg/vcs/vcs.go +++ b/pkg/vcs/vcs.go @@ -16,6 +16,7 @@ import ( "github.com/google/syzkaller/dashboard/dashapi" "github.com/google/syzkaller/pkg/osutil" + "github.com/google/syzkaller/sys/targets" ) type RecipientType int @@ -168,19 +169,19 @@ const ( func NewRepo(os, vm, dir string, opts ...RepoOpt) (Repo, error) { switch os { - case "linux": + case targets.Linux: return newLinux(dir, opts), nil - case "akaros": + case targets.Akaros: return newAkaros(dir, opts), nil - case "fuchsia": + case targets.Fuchsia: return newFuchsia(dir, opts), nil - case "openbsd": + case targets.OpenBSD: return newGit(dir, nil, opts), nil - case "netbsd": + case targets.NetBSD: return newGit(dir, nil, opts), nil - case "freebsd": + case targets.FreeBSD: return newGit(dir, nil, opts), nil - case "test": + case targets.TestOS: return newTestos(dir, opts), nil } return nil, fmt.Errorf("vcs is unsupported for %v", os) -- cgit mrf-deployment