diff options
| author | Cary Coutant <ccoutant@google.com> | 2012-03-09 11:50:43 -0800 |
|---|---|---|
| committer | Cary Coutant <ccoutant@google.com> | 2012-03-09 11:50:43 -0800 |
| commit | 4ed2fc3a6bbaaf1f2ea4d1c077dc7fa0867cd005 (patch) | |
| tree | 7774dcb772ccc005c2fd8f8831dc45b90a8f6060 /libgo/go/runtime/pprof/pprof_test.go | |
| parent | 2400d467a903f32c96df9f9fcb0de7be8a655afa (diff) | |
| parent | f9c681635d1850543f547fdbb6efd5a010aca015 (diff) | |
| download | gcc-4ed2fc3a6bbaaf1f2ea4d1c077dc7fa0867cd005.tar.gz | |
Merge branch 'master' into google-debugfission
Diffstat (limited to 'libgo/go/runtime/pprof/pprof_test.go')
| -rw-r--r-- | libgo/go/runtime/pprof/pprof_test.go | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libgo/go/runtime/pprof/pprof_test.go b/libgo/go/runtime/pprof/pprof_test.go index 5f128c01cf1..2dc7aef7e96 100644 --- a/libgo/go/runtime/pprof/pprof_test.go +++ b/libgo/go/runtime/pprof/pprof_test.go @@ -7,6 +7,7 @@ package pprof_test import ( "bytes" "hash/crc32" + "os/exec" "runtime" . "runtime/pprof" "strings" @@ -17,8 +18,16 @@ import ( func TestCPUProfile(t *testing.T) { switch runtime.GOOS { case "darwin": - // see Apple Bug Report #9177434 (copied into change description) - return + out, err := exec.Command("uname", "-a").CombinedOutput() + if err != nil { + t.Fatal(err) + } + vers := string(out) + t.Logf("uname -a: %v", vers) + if strings.Contains(vers, "Darwin Kernel Version 10.8.0") && strings.Contains(vers, "root:xnu-1504.15.3~1/RELEASE_X86_64") { + t.Logf("skipping test on known-broken kernel (64-bit Snow Leopard)") + return + } case "plan9": // unimplemented return |