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/compiler/compiler_test.go | |
| 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/compiler/compiler_test.go')
| -rw-r--r-- | pkg/compiler/compiler_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/compiler/compiler_test.go b/pkg/compiler/compiler_test.go index e5c7987d1..9bc93a519 100644 --- a/pkg/compiler/compiler_test.go +++ b/pkg/compiler/compiler_test.go @@ -66,11 +66,11 @@ func TestData(t *testing.T) { // E.g. if we failed to parse descriptions, we won't run type checking at all. // Because of this we have one file per phase. for _, name := range []string{"errors.txt", "errors2.txt", "errors3.txt", "warnings.txt", "all.txt"} { - for _, arch := range []string{"32_shmem", "64"} { + for _, arch := range []string{targets.TestArch32Shmem, targets.TestArch64} { name, arch := name, arch t.Run(fmt.Sprintf("%v/%v", name, arch), func(t *testing.T) { t.Parallel() - target := targets.List["test"][arch] + target := targets.List[targets.TestOS][arch] fileName := filepath.Join("testdata", name) em := ast.NewErrorMatcher(t, fileName) astDesc := ast.Parse(em.Data, name, em.ErrorHandler) @@ -182,7 +182,7 @@ s2 { if desc == nil { t.Fatal("failed to parse") } - p := Compile(desc, map[string]uint64{"SYS_foo": 1}, targets.List["test"]["64"], eh) + p := Compile(desc, map[string]uint64{"SYS_foo": 1}, targets.List[targets.TestOS][targets.TestArch64], eh) if p == nil { t.Fatal("failed to compile") } @@ -201,7 +201,7 @@ func TestCollectUnusedError(t *testing.T) { t.Fatal("failed to parse") } - _, err := CollectUnused(desc, targets.List["test"]["64"], nopErrorHandler) + _, err := CollectUnused(desc, targets.List[targets.TestOS][targets.TestArch64], nopErrorHandler) if err == nil { t.Fatal("CollectUnused should have failed but didn't") } @@ -252,7 +252,7 @@ func TestCollectUnused(t *testing.T) { t.Fatalf("Test %d: failed to parse", i) } - nodes, err := CollectUnused(desc, targets.List["test"]["64"], nil) + nodes, err := CollectUnused(desc, targets.List[targets.TestOS][targets.TestArch64], nil) if err != nil { t.Fatalf("Test %d: CollectUnused failed: %v", i, err) } |
