From 7320506bc58d3a55eff2c67b2ec65cfa94f7b0a7 Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 27 Jul 2017 04:33:18 +0000 Subject: [PATCH] [release-branch.go1.9] cmd/dist: skip moved GOROOT on Go's Windows builders when not sharding tests Change-Id: I0bcae339624e7d61037d9ea0885b7bd07491bbb6 Reviewed-on: https://go-review.googlesource.com/51430 Run-TryBot: Brad Fitzpatrick TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor (cherry picked from commit 4833e920c1d7f6b23458e6ff3c73951fcf754219) Reviewed-on: https://go-review.googlesource.com/51450 Reviewed-by: Brad Fitzpatrick --- src/cmd/dist/test.go | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/cmd/dist/test.go b/src/cmd/dist/test.go index 6846970ecf..73432d31ea 100644 --- a/src/cmd/dist/test.go +++ b/src/cmd/dist/test.go @@ -447,6 +447,17 @@ func (t *tester) registerTests() { t.runPending(dt) moved := t.goroot + "-moved" if err := os.Rename(t.goroot, moved); err != nil { + if t.goos == "windows" { + // Fails on Windows (with "Access is denied") if a process + // or binary is in this directory. For instance, using all.bat + // when run from c:\workdir\go\src fails here + // if GO_BUILDER_NAME is set. Our builders invoke tests + // a different way which happens to work when sharding + // tests, but we should be tolerant of the non-sharded + // all.bat case. + log.Printf("skipping test on Windows") + return nil + } return err }