From 8456b07099a89bab05e60ba1df8e6572c3c6bd81 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Sun, 2 Jun 2019 00:51:46 +0200 Subject: [PATCH] cmd/go/internal/imports: match solaris files for illumos Like the android/linux pair, match files with GOOS=solaris if GOOS=illumos Follow-up for CL 174457 Fixes #32370 Updates #20603 Change-Id: Id01de8bb3990d7bbb22f735a4abed2b3cf8b4062 Reviewed-on: https://go-review.googlesource.com/c/go/+/179997 Run-TryBot: Tobias Klauser TryBot-Result: Gobot Gobot Reviewed-by: Benny Siegert Reviewed-by: Bryan C. Mills --- src/cmd/go/internal/imports/build.go | 7 ++++++- src/cmd/go/internal/imports/testdata/illumos/a_illumos.go | 3 +++ .../internal/imports/testdata/illumos/b_illumos_amd64.go | 3 +++ src/cmd/go/internal/imports/testdata/illumos/c_solaris.go | 3 +++ .../internal/imports/testdata/illumos/d_solaris_amd64.go | 3 +++ src/cmd/go/internal/imports/testdata/illumos/e.go | 5 +++++ src/cmd/go/internal/imports/testdata/illumos/f.go | 5 +++++ src/cmd/go/internal/imports/testdata/illumos/g.go | 5 +++++ src/cmd/go/internal/imports/testdata/illumos/tags.txt | 1 + src/cmd/go/internal/imports/testdata/illumos/want.txt | 6 ++++++ 10 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 src/cmd/go/internal/imports/testdata/illumos/a_illumos.go create mode 100644 src/cmd/go/internal/imports/testdata/illumos/b_illumos_amd64.go create mode 100644 src/cmd/go/internal/imports/testdata/illumos/c_solaris.go create mode 100644 src/cmd/go/internal/imports/testdata/illumos/d_solaris_amd64.go create mode 100644 src/cmd/go/internal/imports/testdata/illumos/e.go create mode 100644 src/cmd/go/internal/imports/testdata/illumos/f.go create mode 100644 src/cmd/go/internal/imports/testdata/illumos/g.go create mode 100644 src/cmd/go/internal/imports/testdata/illumos/tags.txt create mode 100644 src/cmd/go/internal/imports/testdata/illumos/want.txt diff --git a/src/cmd/go/internal/imports/build.go b/src/cmd/go/internal/imports/build.go index 1e44a83c72..3e9fe357e0 100644 --- a/src/cmd/go/internal/imports/build.go +++ b/src/cmd/go/internal/imports/build.go @@ -138,6 +138,9 @@ func matchTag(name string, tags map[string]bool, want bool) bool { if name == "linux" { have = have || tags["android"] } + if name == "solaris" { + have = have || tags["illumos"] + } return have == want } @@ -152,7 +155,9 @@ func matchTag(name string, tags map[string]bool, want bool) bool { // name_$(GOARCH)_test.* // name_$(GOOS)_$(GOARCH)_test.* // -// An exception: if GOOS=android, then files with GOOS=linux are also matched. +// Exceptions: +// if GOOS=android, then files with GOOS=linux are also matched. +// if GOOS=illumos, then files with GOOS=solaris are also matched. // // If tags["*"] is true, then MatchFile will consider all possible // GOOS and GOARCH to be available and will consequently diff --git a/src/cmd/go/internal/imports/testdata/illumos/a_illumos.go b/src/cmd/go/internal/imports/testdata/illumos/a_illumos.go new file mode 100644 index 0000000000..2e6cb50805 --- /dev/null +++ b/src/cmd/go/internal/imports/testdata/illumos/a_illumos.go @@ -0,0 +1,3 @@ +package illumos + +import _ "a" diff --git a/src/cmd/go/internal/imports/testdata/illumos/b_illumos_amd64.go b/src/cmd/go/internal/imports/testdata/illumos/b_illumos_amd64.go new file mode 100644 index 0000000000..2834d80660 --- /dev/null +++ b/src/cmd/go/internal/imports/testdata/illumos/b_illumos_amd64.go @@ -0,0 +1,3 @@ +package illumos + +import _ "b" diff --git a/src/cmd/go/internal/imports/testdata/illumos/c_solaris.go b/src/cmd/go/internal/imports/testdata/illumos/c_solaris.go new file mode 100644 index 0000000000..d7f9462f15 --- /dev/null +++ b/src/cmd/go/internal/imports/testdata/illumos/c_solaris.go @@ -0,0 +1,3 @@ +package illumos + +import _ "c" diff --git a/src/cmd/go/internal/imports/testdata/illumos/d_solaris_amd64.go b/src/cmd/go/internal/imports/testdata/illumos/d_solaris_amd64.go new file mode 100644 index 0000000000..0f52c2bb48 --- /dev/null +++ b/src/cmd/go/internal/imports/testdata/illumos/d_solaris_amd64.go @@ -0,0 +1,3 @@ +package illumos + +import _ "d" diff --git a/src/cmd/go/internal/imports/testdata/illumos/e.go b/src/cmd/go/internal/imports/testdata/illumos/e.go new file mode 100644 index 0000000000..5e1ed3cb9d --- /dev/null +++ b/src/cmd/go/internal/imports/testdata/illumos/e.go @@ -0,0 +1,5 @@ +// +build illumos + +package illumos + +import _ "e" diff --git a/src/cmd/go/internal/imports/testdata/illumos/f.go b/src/cmd/go/internal/imports/testdata/illumos/f.go new file mode 100644 index 0000000000..f3e3f728bc --- /dev/null +++ b/src/cmd/go/internal/imports/testdata/illumos/f.go @@ -0,0 +1,5 @@ +// +build solaris + +package illumos + +import _ "f" diff --git a/src/cmd/go/internal/imports/testdata/illumos/g.go b/src/cmd/go/internal/imports/testdata/illumos/g.go new file mode 100644 index 0000000000..b30f1eb403 --- /dev/null +++ b/src/cmd/go/internal/imports/testdata/illumos/g.go @@ -0,0 +1,5 @@ +// +build !illumos + +package illumos + +import _ "g" diff --git a/src/cmd/go/internal/imports/testdata/illumos/tags.txt b/src/cmd/go/internal/imports/testdata/illumos/tags.txt new file mode 100644 index 0000000000..b6386a3260 --- /dev/null +++ b/src/cmd/go/internal/imports/testdata/illumos/tags.txt @@ -0,0 +1 @@ +illumos amd64 diff --git a/src/cmd/go/internal/imports/testdata/illumos/want.txt b/src/cmd/go/internal/imports/testdata/illumos/want.txt new file mode 100644 index 0000000000..0fdf397db0 --- /dev/null +++ b/src/cmd/go/internal/imports/testdata/illumos/want.txt @@ -0,0 +1,6 @@ +a +b +c +d +e +f -- 2.50.0