From: Shenghou Ma <minux@golang.org>
Date: Sat, 19 Sep 2015 10:59:06 +0000 (-0400)
Subject: go/types: skip $GOROOT/src/*.go in TestStdlib
X-Git-Tag: go1.7beta1~1790
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a4b143bc22ff471a96c42458833998151df70cc0;p=gostls13.git

go/types: skip $GOROOT/src/*.go in TestStdlib

Change-Id: I4a75d98a48675e2beb5b4843fb2c6ff5d4c8d2a2
Reviewed-on: https://go-review.googlesource.com/14769
Reviewed-by: Robert Griesemer <gri@golang.org>
---

diff --git a/src/go/types/stdlib_test.go b/src/go/types/stdlib_test.go
index 09f2585bcf..97e6a69521 100644
--- a/src/go/types/stdlib_test.go
+++ b/src/go/types/stdlib_test.go
@@ -266,13 +266,16 @@ func walkDirs(t *testing.T, dir string) {
 	}
 
 	// typecheck package in directory
-	files, err := pkgFilenames(dir)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if files != nil {
-		typecheck(t, dir, files)
+	// but ignore files directly under $GOROOT/src (might be temporary test files).
+	if dir != filepath.Join(runtime.GOROOT(), "src") {
+		files, err := pkgFilenames(dir)
+		if err != nil {
+			t.Error(err)
+			return
+		}
+		if files != nil {
+			typecheck(t, dir, files)
+		}
 	}
 
 	// traverse subdirectories, but don't walk into testdata