undo CL 12787044 / ed695cdf962b

The NetBSD and OpenBSD failures are apparently real,
not due to the test bug fixed in 100b9fc0c46f.

««« original CL description
runtime/pprof: test netbsd and openbsd again

Maybe these will work now.

R=golang-dev, dvyukov, bradfitz
CC=golang-dev
https://golang.org/cl/12787044
»»»

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/12873043

diff --git a/src/pkg/runtime/pprof/pprof.go b/src/pkg/runtime/pprof/pprof.go
index 358539a5d1c05a39742b9ef453be40db10e7b7f0..e7eb66a5576d73cc73fdd86fcc69b52caf97feb1 100644 (file)
--- a/src/pkg/runtime/pprof/pprof.go
+++ b/src/pkg/runtime/pprof/pprof.go
@@ -20,7 +20,7 @@ import (
        "text/tabwriter"
 )
 
-// BUG(rsc): Profiles are incomplete and inaccuate on OS X.
+// BUG(rsc): Profiles are incomplete and inaccuate on NetBSD, OpenBSD, and OS X.
 // See http://golang.org/issue/6047 for details.
 
 // A Profile is a collection of stack traces showing the call sequences

diff --git a/src/pkg/runtime/pprof/pprof_test.go b/src/pkg/runtime/pprof/pprof_test.go
index 64c55b05ee1235ed88ffd6c04bcf51933794fdf8..738e2c4ec4e9e3b2278cc8245a81170b49c6e44e 100644 (file)
--- a/src/pkg/runtime/pprof/pprof_test.go
+++ b/src/pkg/runtime/pprof/pprof_test.go
@@ -175,9 +175,9 @@ func TestCPUProfileWithFork(t *testing.T) {
 
 // Operating systems that are expected to fail the tests. See issue 6047.
 var badOS = map[string]bool{
-       "darwin": true,
-       //"netbsd":  true,
-       //"openbsd": true,
+       "darwin":  true,
+       "netbsd":  true,
+       "openbsd": true,
 }
 
 func TestBlockProfile(t *testing.T) {