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 68a4180c90698223bc90ea70ca7eb452f070fa27..398e31ce26f7864f20a6c379b3663da80d522821 100644 (file)
--- 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 03ebb9893aafb6c0f7a6a4ede5b1b35e0ae90c45..08eea1e2bc37899fc1b78bcc78c777a28386669f 100644 (file)
--- 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
 }