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/bisect/bisect_test.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkg/bisect/bisect_test.go') diff --git a/pkg/bisect/bisect_test.go b/pkg/bisect/bisect_test.go index c21548a4d..b2b7596f1 100644 --- a/pkg/bisect/bisect_test.go +++ b/pkg/bisect/bisect_test.go @@ -16,6 +16,7 @@ import ( "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/report" "github.com/google/syzkaller/pkg/vcs" + "github.com/google/syzkaller/sys/targets" ) // testEnv will implement instance.BuilderTester. This allows us to @@ -106,7 +107,7 @@ func createTestRepo(t *testing.T) string { } func runBisection(t *testing.T, baseDir string, test BisectionTest) (*Result, error) { - r, err := vcs.NewRepo("test", "64", baseDir, vcs.OptPrecious) + r, err := vcs.NewRepo(targets.TestOS, targets.TestArch64, baseDir, vcs.OptPrecious) if err != nil { t.Fatal(err) } @@ -120,8 +121,8 @@ func runBisection(t *testing.T, baseDir string, test BisectionTest) (*Result, er Fix: test.fix, Trace: trace, Manager: mgrconfig.Config{ - TargetOS: "test", - TargetVMArch: "64", + TargetOS: targets.TestOS, + TargetVMArch: targets.TestArch64, Type: "qemu", KernelSrc: baseDir, }, -- cgit mrf-deployment