From c5b00d9557fd23dd2a6d9c2f4c80a31d08cac00d Mon Sep 17 00:00:00 2001 From: Michael Matloob Date: Wed, 28 Nov 2018 17:32:05 -0500 Subject: [PATCH] go/packages: fix build breakage caused by math/bits to unsafe dep Our tests compare import graphs from go/packages to expected graphs, and one of the test cases imports math/bits. But in tip math/bits picked up a dependency on unsafe, which means the expected graph is different when run against a Go version >= go1.11. Remove that edge before comparing against the expected graph to work around the breakage. Change-Id: Ic586a75ba530741d251df9f87d0817a8e37d92ea Reviewed-on: https://go-review.googlesource.com/c/151657 Run-TryBot: Michael Matloob TryBot-Result: Gobot Gobot Reviewed-by: Ian Cottrell --- go/packages/packages_test.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/go/packages/packages_test.go b/go/packages/packages_test.go index 5f6c2eb73e..50e6344f3b 100644 --- a/go/packages/packages_test.go +++ b/go/packages/packages_test.go @@ -1600,6 +1600,12 @@ func importGraph(initial []*packages.Package) (string, map[string]*packages.Pack continue } } + // math/bits took on a dependency on unsafe in 1.12, which breaks some + // tests. As a short term hack, prune that edge. + // TODO(matloob): think of a cleaner solution, or remove math/bits from the test. + if p.ID == "math/bits" && imp.ID == "unsafe" { + continue + } edges = append(edges, fmt.Sprintf("%s -> %s", p, imp)) visit(imp) }