diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2015-03-10 18:44:41 +0300 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2015-03-10 16:29:25 +0000 |
| commit | 5471e02338becccdd5df76c96bfeb467c25f003c (patch) | |
| tree | b86cd83f3ad48f344b9be1d7c84ee1d4805aef44 /src/runtime | |
| parent | d0eab030913e067012714d72811d959ce849e7a2 (diff) | |
| download | go-5471e02338becccdd5df76c96bfeb467c25f003c.tar.xz | |
runtime/pprof: fix trace test
Some of the trace stacks are OS-dependent due to OS-specific code
in net package. Check these stacks only on subset of OSes.
Change-Id: If95e4485839f4120fd6395725374c3a2f8706dfc
Reviewed-on: https://go-review.googlesource.com/7300
Run-TryBot: Dmitry Vyukov <dvyukov@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Dmitry Vyukov <dvyukov@google.com>
Diffstat (limited to 'src/runtime')
| -rw-r--r-- | src/runtime/pprof/trace_stack_test.go | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/src/runtime/pprof/trace_stack_test.go b/src/runtime/pprof/trace_stack_test.go index 79ff4ed40d..ef55d52610 100644 --- a/src/runtime/pprof/trace_stack_test.go +++ b/src/runtime/pprof/trace_stack_test.go @@ -221,24 +221,29 @@ func TestTraceSymbolize(t *testing.T) { frame{"runtime/pprof_test.TestTraceSymbolize", 115}, frame{"testing.tRunner", 0}, }}, - eventDesc{trace.EvGoBlockNet, []frame{ - frame{"net.(*netFD).accept", 0}, - frame{"net.(*TCPListener).AcceptTCP", 0}, - frame{"net.(*TCPListener).Accept", 0}, - frame{"runtime/pprof_test.TestTraceSymbolize.func10", 86}, - }}, eventDesc{trace.EvGoSleep, []frame{ frame{"time.Sleep", 0}, frame{"runtime/pprof_test.TestTraceSymbolize", 106}, frame{"testing.tRunner", 0}, }}, - eventDesc{trace.EvGoSysCall, []frame{ - frame{"syscall.read", 0}, - frame{"syscall.Read", 0}, - frame{"os.(*File).read", 0}, - frame{"os.(*File).Read", 0}, - frame{"runtime/pprof_test.TestTraceSymbolize.func11", 100}, - }}, + } + // Stacks for the following events are OS-dependent due to OS-specific code in net package. + if runtime.GOOS != "windows" && runtime.GOOS != "plan9" { + want = append(want, []eventDesc{ + eventDesc{trace.EvGoBlockNet, []frame{ + frame{"net.(*netFD).accept", 0}, + frame{"net.(*TCPListener).AcceptTCP", 0}, + frame{"net.(*TCPListener).Accept", 0}, + frame{"runtime/pprof_test.TestTraceSymbolize.func10", 86}, + }}, + eventDesc{trace.EvGoSysCall, []frame{ + frame{"syscall.read", 0}, + frame{"syscall.Read", 0}, + frame{"os.(*File).read", 0}, + frame{"os.(*File).Read", 0}, + frame{"runtime/pprof_test.TestTraceSymbolize.func11", 100}, + }}, + }...) } matched := make([]bool, len(want)) for _, ev := range events { |