From: Ian Lance Taylor <iant@golang.org>
Date: Fri, 11 Oct 2013 22:55:50 +0000 (-0700)
Subject: go/build: fix test if built with CGO_ENABLED=0
X-Git-Tag: go1.2rc2~31
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=96648e019567d9e50c147638f104f0bf4a381350;p=gostls13.git

go/build: fix test if built with CGO_ENABLED=0

Fixes #6567.

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/14502060
---

diff --git a/src/pkg/go/build/deps_test.go b/src/pkg/go/build/deps_test.go
index 4bb03d5400..dd162c7db7 100644
--- a/src/pkg/go/build/deps_test.go
+++ b/src/pkg/go/build/deps_test.go
@@ -392,6 +392,9 @@ func TestDependencies(t *testing.T) {
 				if allowedErrors[osPkg{ctxt.GOOS, pkg}] {
 					continue
 				}
+				if !ctxt.CgoEnabled && pkg == "runtime/cgo" {
+					continue
+				}
 				// Some of the combinations we try might not
 				// be reasonable (like arm,plan9,cgo), so ignore
 				// errors for the auto-generated combinations.