From a6e3054436b5cc7f8c4acbce9841ecb17f699fb1 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 14 Nov 2019 18:44:30 +0100 Subject: executor: rename some macros Rename some macros in preparation for subsequent changes which will align names across the code base. --- pkg/csource/common.go | 60 +++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'pkg/csource/common.go') diff --git a/pkg/csource/common.go b/pkg/csource/common.go index 49c3096de..2d3f35b52 100644 --- a/pkg/csource/common.go +++ b/pkg/csource/common.go @@ -88,36 +88,36 @@ func commonDefines(p *prog.Prog, opts Options) map[string]bool { sysTarget := targets.Get(p.Target.OS, p.Target.Arch) bitmasks, csums := prog.RequiredFeatures(p) return map[string]bool{ - "GOOS_" + p.Target.OS: true, - "GOARCH_" + p.Target.Arch: true, - "HOSTGOOS_" + runtime.GOOS: true, - "SYZ_USE_BITMASKS": bitmasks, - "SYZ_USE_CHECKSUMS": csums, - "SYZ_SANDBOX_NONE": opts.Sandbox == sandboxNone, - "SYZ_SANDBOX_SETUID": opts.Sandbox == sandboxSetuid, - "SYZ_SANDBOX_NAMESPACE": opts.Sandbox == sandboxNamespace, - "SYZ_SANDBOX_ANDROID_UNTRUSTED_APP": opts.Sandbox == sandboxAndroidUntrustedApp, - "SYZ_THREADED": opts.Threaded, - "SYZ_COLLIDE": opts.Collide, - "SYZ_REPEAT": opts.Repeat, - "SYZ_REPEAT_TIMES": opts.RepeatTimes > 1, - "SYZ_PROCS": opts.Procs > 1, - "SYZ_FAULT_INJECTION": opts.Fault, - "SYZ_ENABLE_LEAK": opts.Leak, - "SYZ_TUN_ENABLE": opts.EnableTun, - "SYZ_ENABLE_CGROUPS": opts.EnableCgroups, - "SYZ_ENABLE_NETDEV": opts.EnableNetDev, - "SYZ_RESET_NET_NAMESPACE": opts.EnableNetReset, - "SYZ_ENABLE_BINFMT_MISC": opts.EnableBinfmtMisc, - "SYZ_ENABLE_CLOSE_FDS": opts.EnableCloseFds, - "SYZ_ENABLE_KCSAN": opts.EnableKCSAN, - "SYZ_ENABLE_DEVLINK_PCI": opts.EnableDevlinkPCI, - "SYZ_USE_TMP_DIR": opts.UseTmpDir, - "SYZ_HANDLE_SEGV": opts.HandleSegv, - "SYZ_REPRO": opts.Repro, - "SYZ_TRACE": opts.Trace, - "SYZ_EXECUTOR_USES_SHMEM": sysTarget.ExecutorUsesShmem, - "SYZ_EXECUTOR_USES_FORK_SERVER": sysTarget.ExecutorUsesForkServer, + "GOOS_" + p.Target.OS: true, + "GOARCH_" + p.Target.Arch: true, + "HOSTGOOS_" + runtime.GOOS: true, + "SYZ_USE_BITMASKS": bitmasks, + "SYZ_USE_CHECKSUMS": csums, + "SYZ_SANDBOX_NONE": opts.Sandbox == sandboxNone, + "SYZ_SANDBOX_SETUID": opts.Sandbox == sandboxSetuid, + "SYZ_SANDBOX_NAMESPACE": opts.Sandbox == sandboxNamespace, + "SYZ_SANDBOX_ANDROID": opts.Sandbox == sandboxAndroidUntrustedApp, + "SYZ_THREADED": opts.Threaded, + "SYZ_COLLIDE": opts.Collide, + "SYZ_REPEAT": opts.Repeat, + "SYZ_REPEAT_TIMES": opts.RepeatTimes > 1, + "SYZ_MULTI_PROC": opts.Procs > 1, + "SYZ_FAULT": opts.Fault, + "SYZ_LEAK": opts.Leak, + "SYZ_NET_INJECTION": opts.EnableTun, + "SYZ_NET_DEVICES": opts.EnableNetDev, + "SYZ_NET_RESET": opts.EnableNetReset, + "SYZ_CGROUPS": opts.EnableCgroups, + "SYZ_BINFMT_MISC": opts.EnableBinfmtMisc, + "SYZ_CLOSE_FDS": opts.EnableCloseFds, + "SYZ_KCSAN": opts.EnableKCSAN, + "SYZ_DEVLINK_PCI": opts.EnableDevlinkPCI, + "SYZ_USE_TMP_DIR": opts.UseTmpDir, + "SYZ_HANDLE_SEGV": opts.HandleSegv, + "SYZ_REPRO": opts.Repro, + "SYZ_TRACE": opts.Trace, + "SYZ_EXECUTOR_USES_SHMEM": sysTarget.ExecutorUsesShmem, + "SYZ_EXECUTOR_USES_FORK_SERVER": sysTarget.ExecutorUsesForkServer, } } -- cgit mrf-deployment