qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 20:30:04 -07:00
Code Releases Activity

cmd/go: fix TestExecutableGOROOT on Windows

Browse Source 
On Windows the drive letter is sometime "c:" and sometimes "C:".

Fixes #20336.

Change-Id: I38c86999af9522c51470d60016729d41cfec6b25
Reviewed-on: https://go-review.googlesource.com/43390
Run-TryBot: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Ian Lance Taylor 2017-05-12 07:11:53 -07:00
parent 22538477a3
commit dddd1dd481
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cmd/go/go_test.go
View File

@ -3974,6 +3974,13 @@ func TestExecutableGOROOT(t *testing.T) {
return strings.TrimSpace(string(out))
}
// Filenames are case insensitive on Windows.
// There should probably be a path/filepath function for this.
equal := func(a, b string) bool { return a == b }
if runtime.GOOS == "windows" {
equal = strings.EqualFold
}
// macOS uses a symlink for /tmp.
resolvedTestGOROOT, err := filepath.EvalSymlinks(testGOROOT)
if err != nil {
@ -3982,13 +3989,13 @@ func TestExecutableGOROOT(t *testing.T) {
// Missing GOROOT/pkg/tool, the go tool should fall back to
// its default path.
if got, want := goroot(newGoTool), resolvedTestGOROOT; got != want {
if got, want := goroot(newGoTool), resolvedTestGOROOT; !equal(got, want) {
t.Fatalf("%s env GOROOT = %q, want %q", newGoTool, got, want)
}
// Now the executable's path looks like a GOROOT.
tg.tempDir("newgoroot/pkg/tool")
if got, want := goroot(newGoTool), tg.path("newgoroot"); got != want {
if got, want := goroot(newGoTool), tg.path("newgoroot"); !equal(got, want) {
t.Fatalf("%s env GOROOT = %q with pkg/tool, want %q", newGoTool, got, want)
}
@ -4003,7 +4010,7 @@ func TestExecutableGOROOT(t *testing.T) {
t.Fatalf("could not eval newgoroot symlinks: %v", err)
}
if got, want := goroot(symGoTool), resolvedNewGOROOT; got != want {
if got, want := goroot(symGoTool), resolvedNewGOROOT; !equal(got, want) {
t.Fatalf("%s env GOROOT = %q, want %q", symGoTool, got, want)
}
}