diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-10-26 10:51:06 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-10-26 15:44:28 +0100 |
| commit | e6e35dba937599d098fc034eff2686e5ddc409e9 (patch) | |
| tree | 802be708d0bc84dee01b9285639690a53f1f6f94 /pkg/ipc | |
| parent | d46bc75207fea1d7671c1277dd660cf1a4d7847b (diff) | |
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.
Diffstat (limited to 'pkg/ipc')
| -rw-r--r-- | pkg/ipc/ipc.go | 2 | ||||
| -rw-r--r-- | pkg/ipc/ipc_test.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/ipc/ipc.go b/pkg/ipc/ipc.go index ffa8a4e6f..06b39af9d 100644 --- a/pkg/ipc/ipc.go +++ b/pkg/ipc/ipc.go @@ -268,7 +268,7 @@ func (env *Env) Exec(opts *ExecOpts, p *prog.Prog) (output []byte, info *ProgInf atomic.AddUint64(&env.StatExecs, 1) if env.cmd == nil { - if p.Target.OS != "test" && targets.Get(p.Target.OS, p.Target.Arch).HostFuzzer { + if p.Target.OS != targets.TestOS && targets.Get(p.Target.OS, p.Target.Arch).HostFuzzer { // The executor is actually ssh, // starting them too frequently leads to timeouts. <-rateLimit.C diff --git a/pkg/ipc/ipc_test.go b/pkg/ipc/ipc_test.go index c8210cdcd..e7c9aa0f8 100644 --- a/pkg/ipc/ipc_test.go +++ b/pkg/ipc/ipc_test.go @@ -73,7 +73,7 @@ func TestExecutor(t *testing.T) { bin := buildExecutor(t, target) defer os.Remove(bin) // qemu-user may allow us to run some cross-arch binaries. - if _, err := osutil.RunCmd(time.Minute, "", bin, "test"); err != nil { + if _, err := osutil.RunCmd(time.Minute, "", bin, targets.TestOS); err != nil { if sysTarget.Arch == runtime.GOOS || sysTarget.VMArch == runtime.GOOS { t.Fatal(err) } |