qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-19 14:54:43 -07:00
Code Releases Activity

cmd/vendor/github.com/google/pprof: fix iOS builders

Browse Source 
The recent vendored pprof update broke the iOS builders. The issue was
reported and patched upstream. Re-vendor the internal pprof copy.

Updates vendored pprof to commit 9e20b5b106e946f4cd1df94c1f6fe3f88456628d
from github.com/google/pprof (2017-11-08).

Fixes #22612

Change-Id: I74c46c75e92ce401e605c55e27d8545c0d66082c
Reviewed-on: https://go-review.googlesource.com/76651
Reviewed-by: Elias Naur <elias.naur@gmail.com>
This commit is contained in:
Alberto Donizetti 2017-11-09 13:48:35 +01:00 committed by Brad Fitzpatrick
parent 183616048a
commit 8fc64a3060
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cmd/vendor/github.com/google/pprof/internal/driver/fetch_test.go generated vendored
View File

@ -411,9 +411,14 @@ func TestHttpsInsecure(t *testing.T) {
Timeout: 10, Timeout: 10,
Symbolize: "remote", Symbolize: "remote",
} }
rx := "Saved profile in"
if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
// On iOS, $HOME points to the app root directory and is not writable.
rx += "|Could not use temp dir"
}
o := &plugin.Options{ o := &plugin.Options{
Obj: &binutils.Binutils{}, Obj: &binutils.Binutils{},
UI: &proftest.TestUI{T: t, AllowRx: "Saved profile in"}, UI: &proftest.TestUI{T: t, AllowRx: rx},
} }
o.Sym = &symbolizer.Symbolizer{Obj: o.Obj, UI: o.UI} o.Sym = &symbolizer.Symbolizer{Obj: o.Obj, UI: o.UI}
p, err := fetchProfiles(s, o) p, err := fetchProfiles(s, o)
@ -423,9 +428,15 @@ func TestHttpsInsecure(t *testing.T) {
if len(p.SampleType) == 0 { if len(p.SampleType) == 0 {
t.Fatalf("fetchProfiles(%s) got empty profile: len(p.SampleType)==0", address) t.Fatalf("fetchProfiles(%s) got empty profile: len(p.SampleType)==0", address)
} }
if runtime.GOOS == "plan9" { switch runtime.GOOS {
case "plan9":
// CPU profiling is not supported on Plan9; see golang.org/issues/22564. // CPU profiling is not supported on Plan9; see golang.org/issues/22564.
return return
case "darwin":
if runtime.GOARCH == "arm" || runtime.GOARCH == "arm64" {
// CPU profiling on iOS os not symbolized; see golang.org/issues/22612.
return
}
} }
if len(p.Function) == 0 { if len(p.Function) == 0 {
t.Fatalf("fetchProfiles(%s) got non-symbolized profile: len(p.Function)==0", address) t.Fatalf("fetchProfiles(%s) got non-symbolized profile: len(p.Function)==0", address)

4
src/cmd/vendor/vendor.json vendored
View File

@ -9,8 +9,8 @@
{ {
"canonical": "github.com/google/pprof", "canonical": "github.com/google/pprof",
"local": "github.com/google/pprof", "local": "github.com/google/pprof",
"revision": "79c4198ef7bd1069f8f56501fc05f0f1d2c33d8a", "revision": "9e20b5b106e946f4cd1df94c1f6fe3f88456628d",
"revisionTime": "2017-11-03T16:44:35Z", "revisionTime": "2017-11-08T17:47:23Z"
}, },
{ {
"canonical": "golang.org/x/arch/x86/x86asm", "canonical": "golang.org/x/arch/x86/x86asm",