Skip to content

Commit 25aaeaa

Browse files
Issac Trottsianlancetaylor
Issac Trotts
authored andcommitted
cmd/go: no longer eval symlinks in inDir
Evaluating the symlinks was slowing down test cache checks. Fixes #26562 Fixes #26726 ijt:~/gopath/src/issue26562$ cat foo_test.go package foo_test import ( "fmt" "os" "path/filepath" "testing" ) // package and imports snipped func TestCache(t *testing.T) { tmp := os.TempDir() for i := 0; i < 1000000; i++ { os.Stat(filepath.Join(tmp, fmt.Sprintf("%d", i))) } } ijt:~/gopath/src/issue26562$ time ~/github/go/bin/go test -count=1 PASS ok issue26562 9.444s real 0m10.021s user 0m2.344s sys 0m7.835s ijt:~/gopath/src/issue26562$ time ~/github/go/bin/go test . ok issue26562 (cached) real 0m0.802s user 0m0.551s sys 0m0.306s Change-Id: I3ce7f7b68bb5b9e802069f277e79e1ed3c162622 Reviewed-on: https://go-review.googlesource.com/127635 Run-TryBot: Ian Lance Taylor <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 6eabfab commit 25aaeaa

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

src/cmd/go/internal/test/test.go

+1-9
Original file line numberDiff line numberDiff line change
@@ -1448,15 +1448,7 @@ func computeTestInputsID(a *work.Action, testlog []byte) (cache.ActionID, error)
14481448
}
14491449

14501450
func inDir(path, dir string) bool {
1451-
if str.HasFilePathPrefix(path, dir) {
1452-
return true
1453-
}
1454-
xpath, err1 := filepath.EvalSymlinks(path)
1455-
xdir, err2 := filepath.EvalSymlinks(dir)
1456-
if err1 == nil && err2 == nil && str.HasFilePathPrefix(xpath, xdir) {
1457-
return true
1458-
}
1459-
return false
1451+
return str.HasFilePathPrefix(path, dir)
14601452
}
14611453

14621454
func hashGetenv(name string) cache.ActionID {

0 commit comments

Comments
 (0)