From 9ff00c8fc99b203138747a622f7014dff317c013 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Mon, 5 Mar 2012 21:33:44 -0800 Subject: [PATCH] go/build: fix windows and plan9 builds Bit of a band-aid fix. R=golang-dev, rsc CC=golang-dev https://golang.org/cl/5757045 --- src/pkg/go/build/deps_test.go | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/pkg/go/build/deps_test.go b/src/pkg/go/build/deps_test.go index 90389240581..d10bfa8f36e 100644 --- a/src/pkg/go/build/deps_test.go +++ b/src/pkg/go/build/deps_test.go @@ -349,6 +349,17 @@ var bools = []bool{false, true} var geese = []string{"darwin", "freebsd", "linux", "netbsd", "openbsd", "plan9", "windows"} var goarches = []string{"386", "amd64", "arm"} +type osPkg struct { + goos, pkg string +} + +// allowedErrors are the operating systems and packages known to contain errors +// (currently just "no Go source files") +var allowedErrors = map[osPkg]bool{ + osPkg{"windows", "log/syslog"}: true, + osPkg{"plan9", "log/syslog"}: true, +} + func TestDependencies(t *testing.T) { var all []string @@ -365,6 +376,9 @@ func TestDependencies(t *testing.T) { } p, err := ctxt.Import(pkg, "", 0) if err != nil { + if allowedErrors[osPkg{ctxt.GOOS, pkg}] { + continue + } // Some of the combinations we try might not // be reasonable (like arm,plan9,cgo), so ignore // errors for the auto-generated combinations.