diff options
| author | Brad Fitzpatrick <bradfitz@golang.org> | 2017-07-27 04:33:18 +0000 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@golang.org> | 2017-07-27 05:56:03 +0000 |
| commit | 7320506bc58d3a55eff2c67b2ec65cfa94f7b0a7 (patch) | |
| tree | 58d11004013fddd42276e43aa10ff4b7f1479fb7 | |
| parent | 65c6c88a9442b91d8b2fd0230337b1fda4bb6cdf (diff) | |
| download | go-7320506bc58d3a55eff2c67b2ec65cfa94f7b0a7.tar.gz go-7320506bc58d3a55eff2c67b2ec65cfa94f7b0a7.zip | |
[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 <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
(cherry picked from commit 4833e920c1d7f6b23458e6ff3c73951fcf754219)
Reviewed-on: https://go-review.googlesource.com/51450
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
| -rw-r--r-- | src/cmd/dist/test.go | 11 |
1 files changed, 11 insertions, 0 deletions
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 } |