Browse Source

Merge pull request #68 from tendermint/bugfix/gopath-executes-go

make GoPath a function
pull/1842/head
Anton Kaliaev 7 years ago
committed by GitHub
parent
commit
0a652499ea
2 changed files with 31 additions and 9 deletions
  1. +9
    -4
      common/os.go
  2. +22
    -5
      common/os_test.go

+ 9
- 4
common/os.go View File

@ -13,11 +13,15 @@ import (
"syscall"
)
var (
GoPath = gopath()
)
var gopath string
// GoPath returns GOPATH env variable value. If it is not set, this function
// will try to call `go env GOPATH` subcommand.
func GoPath() string {
if gopath != "" {
return gopath
}
func gopath() string {
path := os.Getenv("GOPATH")
if len(path) == 0 {
goCmd := exec.Command("go", "env", "GOPATH")
@ -27,6 +31,7 @@ func gopath() string {
}
path = string(out)
}
gopath = path
return path
}


+ 22
- 5
common/os_test.go View File

@ -39,14 +39,31 @@ func TestGoPath(t *testing.T) {
if err != nil {
t.Fatal(err)
}
path = gopath()
path = GoPath()
if path != "~/testgopath" {
t.Fatalf("gopath should return GOPATH env var if set, got %v", path)
t.Fatalf("should get GOPATH env var value, got %v", path)
}
os.Unsetenv("GOPATH")
path = gopath()
if path == "~/testgopath" || path == "" {
t.Fatalf("gopath should return go env GOPATH result if env var does not exist, got %v", path)
path = GoPath()
if path != "~/testgopath" {
t.Fatalf("subsequent calls should return the same value, got %v", path)
}
}
func TestGoPathWithoutEnvVar(t *testing.T) {
// restore original gopath upon exit
path := os.Getenv("GOPATH")
defer func() {
_ = os.Setenv("GOPATH", path)
}()
os.Unsetenv("GOPATH")
// reset cache
gopath = ""
path = GoPath()
if path == "" || path == "~/testgopath" {
t.Fatalf("should get nonempty result of calling go env GOPATH, got %v", path)
}
}

Loading…
Cancel
Save