testing: rename type Test to InternalTest

type Benchmark has been renamed to InternalBenchmark

R=rsc
CC=golang-dev
https://golang.org/cl/2942042

diff --git a/src/cmd/gotest/gotest b/src/cmd/gotest/gotest
index 7c2c5fbaafcdf8fd6754033f876f6c4521a28501..7572610d2e3cba22bb62aa0df404dc3d7d7ea507 100755 (executable)
--- a/src/cmd/gotest/gotest
+++ b/src/cmd/gotest/gotest
@@ -150,7 +150,7 @@ importpath=$(gomake -s importpath)
        echo 'import __regexp__ "regexp"' # rename in case tested package is called regexp
        # test array
        echo
-       echo 'var tests = []testing.Test{'
+       echo 'var tests = []testing.InternalTest{'
        for i in $tests
        do
                echo '  {"'$i'", '$i'},'

diff --git a/src/pkg/testing/testing.go b/src/pkg/testing/testing.go
index b01f6336fc49c501f16ad261a07909da9302f36b..ae6d03464611ee583ef2de5eba5c631bcdc483fe 100644 (file)
--- a/src/pkg/testing/testing.go
+++ b/src/pkg/testing/testing.go
@@ -123,19 +123,19 @@ func (t *T) Fatalf(format string, args ...interface{}) {
 
 // An internal type but exported because it is cross-package; part of the implementation
 // of gotest.
-type Test struct {
+type InternalTest struct {
        Name string
        F    func(*T)
 }
 
-func tRunner(t *T, test *Test) {
+func tRunner(t *T, test *InternalTest) {
        test.F(t)
        t.ch <- t
 }
 
 // An internal function but exported because it is cross-package; part of the implementation
 // of gotest.
-func Main(matchString func(pat, str string) (bool, os.Error), tests []Test) {
+func Main(matchString func(pat, str string) (bool, os.Error), tests []InternalTest) {
        flag.Parse()
        ok := true
        if len(tests) == 0 {