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

misc/android,misc/ios: evaluate current working directory symlinks

Browse Source 
Previous CLs added symlink evaulation to GOROOT and GOPATH.
Unfortunately that only fixed tests that ran outside GOROOT.

To fix the standard library tests, evaluate symlinks in the current
working directory as well.

Change-Id: Ia406a968235ae4321a1002567520105998582d15
Reviewed-on: https://go-review.googlesource.com/c/164699
Run-TryBot: Elias Naur <mail@eliasnaur.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Elias Naur 2019-03-01 08:25:35 +01:00
parent 4e10ce45f5
commit 8eef74b493
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/android/go_android_exec.go
View File

@ -156,6 +156,10 @@ func subdir() (pkgpath string, underGoRoot bool) {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
cwd, err = filepath.EvalSymlinks(cwd)
if err != nil {
log.Fatal(err)
}
goroot, err := filepath.EvalSymlinks(runtime.GOROOT()) goroot, err := filepath.EvalSymlinks(runtime.GOROOT())
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)

4
misc/ios/go_darwin_arm_exec.go
View File

@ -633,6 +633,10 @@ func subdir() (pkgpath string, underGoRoot bool, err error) {
if err != nil { if err != nil {
return "", false, err return "", false, err
} }
cwd, err = filepath.EvalSymlinks(cwd)
if err != nil {
log.Fatal(err)
}
goroot, err := filepath.EvalSymlinks(runtime.GOROOT()) goroot, err := filepath.EvalSymlinks(runtime.GOROOT())
if err != nil { if err != nil {
return "", false, err return "", false, err