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/host/features.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'pkg/host/features.go') diff --git a/pkg/host/features.go b/pkg/host/features.go index 8b78637fb..14d4f5c89 100644 --- a/pkg/host/features.go +++ b/pkg/host/features.go @@ -102,7 +102,7 @@ func Setup(target *prog.Target, features *Features, featureFlags csource.Feature if features[FeatureFault].Enabled { args = append(args, "fault") } - if target.OS == "linux" && featureFlags["binfmt_misc"].Enabled { + if target.OS == targets.Linux && featureFlags["binfmt_misc"].Enabled { args = append(args, "binfmt_misc") } if features[FeatureKCSAN].Enabled { @@ -117,6 +117,6 @@ func Setup(target *prog.Target, features *Features, featureFlags csource.Feature func noHostChecks(target *prog.Target) bool { // HostFuzzer targets can't run Go binaries on the targets, - // so we actually run on the host on another OS. The same for "test" OS. - return targets.Get(target.OS, target.Arch).HostFuzzer || target.OS == "test" + // so we actually run on the host on another OS. The same for targets.TestOS OS. + return targets.Get(target.OS, target.Arch).HostFuzzer || target.OS == targets.TestOS } -- cgit mrf-deployment