From: Russ Cox <rsc@golang.org>
Date: Fri, 28 Oct 2011 02:39:40 +0000 (-0700)
Subject: go/build: avoid os.Error in tests
X-Git-Tag: weekly.2011-11-01~36
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=134d6e4fc4b6ef31f292f2f69c3af8f94dd9f987;p=gostls13.git

go/build: avoid os.Error in tests

R=golang-dev, adg
CC=golang-dev
https://golang.org/cl/5308061
---

diff --git a/src/pkg/go/build/build_test.go b/src/pkg/go/build/build_test.go
index 68a4180c90..398e31ce26 100644
--- a/src/pkg/go/build/build_test.go
+++ b/src/pkg/go/build/build_test.go
@@ -28,7 +28,7 @@ var buildPkgs = []struct {
 			GoFiles:      []string{"pkgtest.go"},
 			SFiles:       []string{"sqrt_" + runtime.GOARCH + ".s"},
 			Package:      "pkgtest",
-			Imports:      []string{"os"},
+			Imports:      []string{"bytes"},
 			TestImports:  []string{"fmt", "pkgtest"},
 			TestGoFiles:  sortstr([]string{"sqrt_test.go", "sqrt_" + runtime.GOARCH + "_test.go"}),
 			XTestGoFiles: []string{"xsqrt_test.go"},
diff --git a/src/pkg/go/build/pkgtest/pkgtest.go b/src/pkg/go/build/pkgtest/pkgtest.go
index 03ebb9893a..08eea1e2bc 100644
--- a/src/pkg/go/build/pkgtest/pkgtest.go
+++ b/src/pkg/go/build/pkgtest/pkgtest.go
@@ -4,9 +4,9 @@
 
 package pkgtest
 
-import "os"
+import "bytes"
 
-func Foo() os.Error {
+func Foo() *bytes.Buffer {
 	return nil
 }