diff options
| author | Michael Munday <munday@ca.ibm.com> | 2016-11-08 17:11:18 -0500 |
|---|---|---|
| committer | Michael Munday <munday@ca.ibm.com> | 2016-11-09 18:22:00 +0000 |
| commit | 9c2037fbcf1a732f55e29062f3d30ddd21ca36d3 (patch) | |
| tree | a2d033da0e546205213bc5b084e6069407df8f83 | |
| parent | 60a9bf9f957d48856839873c6dcb699afe7da359 (diff) | |
| download | go-9c2037fbcf1a732f55e29062f3d30ddd21ca36d3.tar.gz go-9c2037fbcf1a732f55e29062f3d30ddd21ca36d3.zip | |
runtime/pprof/internal/protopprof: skip TestTranslateCPUProfileWithSamples if < 2 mappings
A Go binary may only have 1 executable memory region if it has been
linked using internal linking. This change means that the test will
be skipped if this is the case, rather than fail.
Fixes #17852.
Change-Id: I59459a0f90ae8963aeb9908e5cb9fb64d7d0e0f4
Reviewed-on: https://go-review.googlesource.com/32920
Run-TryBot: Michael Munday <munday@ca.ibm.com>
Run-TryBot: Michael Matloob <matloob@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
| -rw-r--r-- | src/runtime/pprof/internal/protopprof/protopprof_test.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/runtime/pprof/internal/protopprof/protopprof_test.go b/src/runtime/pprof/internal/protopprof/protopprof_test.go index 2884b1005a..beecefe04c 100644 --- a/src/runtime/pprof/internal/protopprof/protopprof_test.go +++ b/src/runtime/pprof/internal/protopprof/protopprof_test.go @@ -162,7 +162,9 @@ func TestTranslateCPUProfileWithSamples(t *testing.T) { t.Fatalf("Cannot parse /proc/self/maps") } if len(mprof.Mapping) < 2 { - t.Fatalf("Less than two mappings") + // It is possible for a binary to only have 1 executable + // region of memory. + t.Skipf("need 2 or more mappings, got %v", len(mprof.Mapping)) } address1 := mprof.Mapping[0].Start address2 := mprof.Mapping[1].Start |