From 484d9399dee5471e88c69f1ef84cabc45709cac8 Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Tue, 10 Mar 2015 04:11:30 -0400 Subject: [PATCH] cmd/dist: enable external linking test for windows/386 Signed-off-by: Shenghou Ma Change-Id: I2d2ea233f976aab3f356f9b508cdd246d5013e2f Reviewed-on: https://go-review.googlesource.com/7284 Reviewed-by: Ian Lance Taylor Reviewed-by: Alex Brainman --- src/cmd/dist/test.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index ee19702512..486412afbb 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -350,7 +350,8 @@ func (t *tester) extLink() bool { "freebsd-386", "freebsd-amd64", "freebsd-arm", "linux-386", "linux-amd64", "linux-arm", "netbsd-386", "netbsd-amd64", - "openbsd-386", "openbsd-amd64": + "openbsd-386", "openbsd-amd64", + "windows-386": return true case "darwin-386", "darwin-amd64": // linkmode=external fails on OS X 10.6 and earlier == Darwin @@ -369,7 +370,10 @@ func (t *tester) cgoTest() error { env := mergeEnvLists([]string{"GOTRACEBACK=2"}, os.Environ()) iOS := t.goos == "darwin" && (t.goarch == "arm" || t.goarch == "arm64") - if t.gohostos == "windows" || t.goos == "android" || iOS { + switch { + case t.goos == "windows" && t.goarch != "386": + fallthrough + case t.goos == "android", iOS: cmd := t.dirCmd("misc/cgo/test", "go", "test") cmd.Env = env return cmd.Run() @@ -393,7 +397,8 @@ func (t *tester) cgoTest() error { if err := cmd.Run(); err != nil { return err } - case "darwin-386", "darwin-amd64": + case "darwin-386", "darwin-amd64", + "windows-386": if t.extLink() { cmd := t.dirCmd("misc/cgo/test", "go", "test", "-ldflags", "-linkmode=external") cmd.Env = env