diff options
| author | Elias Naur <mail@eliasnaur.com> | 2019-03-01 08:25:35 +0100 |
|---|---|---|
| committer | Elias Naur <mail@eliasnaur.com> | 2019-03-01 16:41:38 +0000 |
| commit | 8eef74b493e48f3dfac6619b01ac7efe26c134b5 (patch) | |
| tree | 69c386f8553f2dd22c01d6aa5caaa384ea34cb5d /misc/android | |
| parent | 4e10ce45f5ea4f1328876c0defd7d8c8150fc397 (diff) | |
| download | go-8eef74b493e48f3dfac6619b01ac7efe26c134b5.tar.gz go-8eef74b493e48f3dfac6619b01ac7efe26c134b5.zip | |
misc/android,misc/ios: evaluate current working directory symlinks
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>
Diffstat (limited to 'misc/android')
| -rw-r--r-- | misc/android/go_android_exec.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/misc/android/go_android_exec.go b/misc/android/go_android_exec.go index 55461df31a..9a4e2afc80 100644 --- a/misc/android/go_android_exec.go +++ b/misc/android/go_android_exec.go @@ -156,6 +156,10 @@ func subdir() (pkgpath string, underGoRoot bool) { if err != nil { log.Fatal(err) } + cwd, err = filepath.EvalSymlinks(cwd) + if err != nil { + log.Fatal(err) + } goroot, err := filepath.EvalSymlinks(runtime.GOROOT()) if err != nil { log.Fatal(err) |