aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/runtest/run_test.go
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-10-26 10:51:06 +0100
committerDmitry Vyukov <dvyukov@google.com>2020-10-26 15:44:28 +0100
commite6e35dba937599d098fc034eff2686e5ddc409e9 (patch)
tree802be708d0bc84dee01b9285639690a53f1f6f94 /pkg/runtest/run_test.go
parentd46bc75207fea1d7671c1277dd660cf1a4d7847b (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/runtest/run_test.go')
-rw-r--r--pkg/runtest/run_test.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkg/runtest/run_test.go b/pkg/runtest/run_test.go
index e4712033e..d72f5940e 100644
--- a/pkg/runtest/run_test.go
+++ b/pkg/runtest/run_test.go
@@ -26,12 +26,12 @@ var flagFilter = flag.String("filter", "", "prefix to match test file names")
func Test(t *testing.T) {
switch runtime.GOOS {
- case "openbsd":
+ case targets.OpenBSD:
t.Skipf("broken on %v", runtime.GOOS)
}
// Test only one target in short mode (each takes 5+ seconds to run).
- shortTarget := targets.Get("test", "64")
- for _, sysTarget := range targets.List["test"] {
+ shortTarget := targets.Get(targets.TestOS, targets.TestArch64)
+ for _, sysTarget := range targets.List[targets.TestOS] {
if testing.Short() && sysTarget != shortTarget {
continue
}
@@ -80,7 +80,7 @@ func test(t *testing.T, sysTarget *targets.Target) {
}
}()
ctx := &Context{
- Dir: filepath.Join("..", "..", "sys", target.OS, "test"),
+ Dir: filepath.Join("..", "..", "sys", target.OS, targets.TestOS),
Target: target,
Tests: *flagFilter,
Features: features,
@@ -100,7 +100,7 @@ func test(t *testing.T, sysTarget *targets.Target) {
func TestParsing(t *testing.T) {
for OS, arches := range targets.List {
- dir := filepath.Join("..", "..", "sys", OS, "test")
+ dir := filepath.Join("..", "..", "sys", OS, targets.TestOS)
if !osutil.IsExist(dir) {
continue
}