diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 10:55:16 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-04-03 10:55:16 -0700 |
| commit | 6a14926b44504e88488e3715b5b84928d454fb49 (patch) | |
| tree | 9cf5f80773922c62ebd9ba07388a1f27354dc516 /libgo/go/runtime/pprof/pprof_test.go | |
| parent | aabd700dee5d71eb0a8180fb3626a23da9a88fdd (diff) | |
| parent | 749dea2a0549c126a0e992a6dd8e9b5eb28e1cee (diff) | |
| download | gcc-6a14926b44504e88488e3715b5b84928d454fb49.tar.gz | |
Merge remote-tracking branch 'origin/master' into hjl/x32/javahjl/x32/java
Diffstat (limited to 'libgo/go/runtime/pprof/pprof_test.go')
| -rw-r--r-- | libgo/go/runtime/pprof/pprof_test.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgo/go/runtime/pprof/pprof_test.go b/libgo/go/runtime/pprof/pprof_test.go index 2dc7aef7e96..82bb2a2926b 100644 --- a/libgo/go/runtime/pprof/pprof_test.go +++ b/libgo/go/runtime/pprof/pprof_test.go @@ -24,8 +24,9 @@ func TestCPUProfile(t *testing.T) { } 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)") + // Lion uses "Darwin Kernel Version 11". + if strings.Contains(vers, "Darwin Kernel Version 10") && strings.Contains(vers, "RELEASE_X86_64") { + t.Logf("skipping test on known-broken kernel (64-bit Leopard / Snow Leopard)") return } case "plan9": |