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/vmimpl/util.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vm/vmimpl') diff --git a/vm/vmimpl/util.go b/vm/vmimpl/util.go index 418ae2d66..47340ccde 100644 --- a/vm/vmimpl/util.go +++ b/vm/vmimpl/util.go @@ -9,6 +9,7 @@ import ( "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/osutil" + "github.com/google/syzkaller/sys/targets" ) // Sleep for d. @@ -24,7 +25,7 @@ func SleepInterruptible(d time.Duration) bool { func WaitForSSH(debug bool, timeout time.Duration, addr, sshKey, sshUser, OS string, port int, stop chan error) error { pwd := "pwd" - if OS == "windows" { + if OS == targets.Windows { pwd = "dir" } startTime := time.Now() -- cgit mrf-deployment