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. --- vm/vm_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'vm/vm_test.go') diff --git a/vm/vm_test.go b/vm/vm_test.go index 8c1f82917..31dd65045 100644 --- a/vm/vm_test.go +++ b/vm/vm_test.go @@ -13,6 +13,7 @@ import ( "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/report" + "github.com/google/syzkaller/sys/targets" "github.com/google/syzkaller/vm/vmimpl" ) @@ -340,9 +341,9 @@ func testMonitorExecution(t *testing.T, test *Test) { defer os.RemoveAll(dir) cfg := &mgrconfig.Config{ Workdir: dir, - TargetOS: "linux", - TargetArch: "amd64", - TargetVMArch: "amd64", + TargetOS: targets.Linux, + TargetArch: targets.AMD64, + TargetVMArch: targets.AMD64, Type: "test", } pool, err := Create(cfg, false) -- cgit mrf-deployment