Commit 355f2530 authored by Russ Cox's avatar Russ Cox

go/build: build $GOOS_test.go always

We decided to build $GOOS.go always
but forgot to test $GOOS_test.go.

Fixes #9159.

LGTM=r
R=r
CC=golang-codereviews
https://golang.org/cl/176290043
parent 04923042
...@@ -1310,11 +1310,13 @@ func (ctxt *Context) goodOSArchFile(name string, allTags map[string]bool) bool { ...@@ -1310,11 +1310,13 @@ func (ctxt *Context) goodOSArchFile(name string, allTags map[string]bool) bool {
// auto-tagging to apply only to files with a non-empty prefix, so // auto-tagging to apply only to files with a non-empty prefix, so
// "foo_linux.go" is tagged but "linux.go" is not. This allows new operating // "foo_linux.go" is tagged but "linux.go" is not. This allows new operating
// sytems, such as android, to arrive without breaking existing code with // sytems, such as android, to arrive without breaking existing code with
// innocuous source code in "android.go". The easiest fix: files without // innocuous source code in "android.go". The easiest fix: cut everything
// underscores are always included. // in the name before the initial _.
if !strings.ContainsRune(name, '_') { i := strings.Index(name, "_")
if i < 0 {
return true return true
} }
name = name[i:] // ignore everything before first _
l := strings.Split(name, "_") l := strings.Split(name, "_")
if n := len(l); n > 0 && l[n-1] == "test" { if n := len(l); n > 0 && l[n-1] == "test" {
......
...@@ -189,6 +189,7 @@ var matchFileTests = []struct { ...@@ -189,6 +189,7 @@ var matchFileTests = []struct {
{ctxtAndroid, "foo_plan9.go", "", false}, {ctxtAndroid, "foo_plan9.go", "", false},
{ctxtAndroid, "android.go", "", true}, {ctxtAndroid, "android.go", "", true},
{ctxtAndroid, "plan9.go", "", true}, {ctxtAndroid, "plan9.go", "", true},
{ctxtAndroid, "plan9_test.go", "", true},
{ctxtAndroid, "arm.s", "", true}, {ctxtAndroid, "arm.s", "", true},
{ctxtAndroid, "amd64.s", "", true}, {ctxtAndroid, "amd64.s", "", true},
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment