Don't use own go/build replacement for importgraph.

dmitshur · dmitshur · commit a49c2ae6edfb · 2016-07-31T15:11:11.000-07:00
It's needed for GopherJS compiler, but we can't use it for importgraph
package since they're 3rd party and rely on "go/build".Package.
diff --git a/build/build_test.go b/build/build_test.go
@@ -2,12 +2,13 @@ package build
 
 import (
 	"fmt"
+	gobuild "go/build"
 	"go/token"
 	"strconv"
 	"strings"
 	"testing"
 
-	gobuild "github.com/gopherjs/gopherjs/go/build"
+	"github.com/gopherjs/gopherjs/go/build"
 	"github.com/kisielk/gotool"
 	"github.com/shurcooL/go/importgraphutil"
 )
@@ -68,9 +69,9 @@ func TestNativesDontImportExtraPackages(t *testing.T) {
 		// Normal package.
 		{
 			// Import the real normal package, and populate its real import set.
-			bpkg, err := gobuild.Import(pkg, "", gobuild.ImportComment)
+			bpkg, err := build.Import(pkg, "", build.ImportComment)
 			if err != nil {
-				t.Fatalf("gobuild.Import: %v", err)
+				t.Fatalf("build.Import: %v", err)
 			}
 			realImports := make(stringSet)
 			populateImportSet(bpkg.Imports, &realImports)
@@ -107,9 +108,9 @@ func TestNativesDontImportExtraPackages(t *testing.T) {
 		// Test package.
 		{
 			// Import the real test package, and populate its real import set.
-			bpkg, err := gobuild.Import(pkg, "", gobuild.ImportComment)
+			bpkg, err := build.Import(pkg, "", build.ImportComment)
 			if err != nil {
-				t.Fatalf("gobuild.Import: %v", err)
+				t.Fatalf("build.Import: %v", err)
 			}
 			realTestImports := make(stringSet)
 			populateImportSet(bpkg.TestImports, &realTestImports)
@@ -146,9 +147,9 @@ func TestNativesDontImportExtraPackages(t *testing.T) {
 		// External test package.
 		{
 			// Import the real external test package, and populate its real import set.
-			bpkg, err := gobuild.Import(pkg, "", gobuild.ImportComment)
+			bpkg, err := build.Import(pkg, "", build.ImportComment)
 			if err != nil {
-				t.Fatalf("gobuild.Import: %v", err)
+				t.Fatalf("build.Import: %v", err)
 			}
 			realXTestImports := make(stringSet)
 			populateImportSet(bpkg.XTestImports, &realXTestImports)
